From e0be09ffab2d530480e8d1b246821ad84f5fdab1 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 28 Dec 2021 16:30:37 +0800 Subject: [PATCH 01/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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/55] =?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 4941d32b890cc644e92a3294cfb9b987cf55b284 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Fri, 7 Jan 2022 17:59:40 +0800 Subject: [PATCH 14/55] =?UTF-8?q?=E6=90=AD=E5=BB=BA=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BF=E6=9C=8D=E5=8A=A1=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/pom.xml | 1 + xhpc-modules/xhpc-message-board/pom.xml | 143 ++++++++++++++++++ .../board/XhpcMessageBoardApplication.java | 37 +++++ .../api/XhpcMessageBoardApiController.java | 41 +++++ .../domain/SendMessageToPlatformRequest.java | 31 ++++ .../service/XhpcMessageBoardService.java | 12 ++ .../impl/XhpcMessageBoardServiceImpl.java | 5 + .../src/main/resources/banner.txt | 10 ++ .../src/main/resources/bootstrap.yml | 25 +++ .../src/main/resources/logback.xml | 75 +++++++++ 10 files changed, 380 insertions(+) create mode 100644 xhpc-modules/xhpc-message-board/pom.xml create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/banner.txt create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/logback.xml diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml index 561957dd..e5a4a82c 100644 --- a/xhpc-modules/pom.xml +++ b/xhpc-modules/pom.xml @@ -19,6 +19,7 @@ xhpc-wxma xhpc-invoice xhpc-tradebill + xhpc-message-board xhpc-modules diff --git a/xhpc-modules/xhpc-message-board/pom.xml b/xhpc-modules/xhpc-message-board/pom.xml new file mode 100644 index 00000000..efffedac --- /dev/null +++ b/xhpc-modules/xhpc-message-board/pom.xml @@ -0,0 +1,143 @@ + + + + xhpc-modules + com.ruoyi + 3.0.0 + + 4.0.0 + + xhpc-message-board + + + 留言板服务 + + + + 8 + 8 + + + + + + + junit + junit + + + + + 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 + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + mysql + mysql-connector-java + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-datascope + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + com.ruoyi + ruoyi-common-core + + + com.squareup.okhttp3 + okhttp + + + com.ruoyi + xhpc-common + 3.0.0 + compile + + + 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 + + + + + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java new file mode 100644 index 00000000..27a76f51 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java @@ -0,0 +1,37 @@ +package com.xhpc.board; + +import com.xhpc.common.security.annotation.EnableCustomConfig; +import com.xhpc.common.security.annotation.EnableRyFeignClients; +import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author WH + * @date 2021/12/7 14:55 + * @since version-1.0 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +@MapperScan("com.xhpc.board.mapper") +public class XhpcMessageBoardApplication { + + public static void main(String[] args) { + + SpringApplication.run(XhpcMessageBoardApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 留言板模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java new file mode 100644 index 00000000..eed7651e --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -0,0 +1,41 @@ +package com.xhpc.board.api; + +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.domain.AjaxResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 小程序的InvoiceController + * + * @author WH + * @date 2021/12/23 13:49 + * @since version-1.0 + */ +@RestController +@RequestMapping("/api/message-board/") +public class XhpcMessageBoardApiController extends BaseController { + + @Resource + XhpcMessageBoardService xhpcMessageBoardService; + + /** + * 用户发起聊天，发送聊天记录给平台客服 + * + * @author WH + * @date 2021/12/28 18:51 + * @since version-1.0 + */ + @PostMapping("/user/message") + public AjaxResult sendMessageToPlatform(@RequestBody SendMessageToPlatformRequest userMessage) { + + return AjaxResult.success(); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java new file mode 100644 index 00000000..1a7a2aa4 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java @@ -0,0 +1,31 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 用户所发送的信息的包装类 + * + * @author WH + * @date 2022/1/7 17:19 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class SendMessageToPlatformRequest { + + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("senderContent") + private String senderContent; + @JsonProperty("receiveId") + private String receiveId; + @JsonProperty("receiverType") + private Integer receiverType; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java new file mode 100644 index 00000000..cae8b8ce --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -0,0 +1,12 @@ +package com.xhpc.board.service; + +/** + * 留言板服务的Service + * + * @author WH + * @date 2022/1/7 17:57 + * @since version-1.0 + */ +public class XhpcMessageBoardService { + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java new file mode 100644 index 00000000..9fee818f --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -0,0 +1,5 @@ +package com.xhpc.board.service.impl; + +public class XhpcMessageBoardServiceImpl { + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt b/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt new file mode 100644 index 00000000..27cacb9c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ __ _ _ + (_) / _|(_)| | + _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ +| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ +| | | |_| || (_) || |_| || | | | | || || __/ +|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| + __/ | + |___/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..b4365277 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml @@ -0,0 +1,25 @@ +# Tomcat +server: + port: 9805 + +# Spring +spring: + application: + # 应用名称 + name: xhpc-message-board + 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} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml b/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml new file mode 100644 index 00000000..66683df0 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/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 + + + + + + + + + + + + + + + + + + From 4184b9dc0f69b28fb0e8f330e1cdb633d6f3ebd4 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Mon, 10 Jan 2022 13:16:35 +0800 Subject: [PATCH 15/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtokenService.getLoginUs?= =?UTF-8?q?er()=E8=BF=94=E5=9B=9ELoginUser=E4=B8=AD=E7=9A=84userType?= =?UTF-8?q?=E4=B8=BAnull=E7=9A=84=E9=97=AE=E9=A2=98=20by=20yy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/system/controller/SysUserController.java | 5 +++++ .../src/main/resources/mapper/system/SysUserMapper.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java index b001f44c..6430a50e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java @@ -11,6 +11,7 @@ import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; @@ -107,6 +108,10 @@ public class SysUserController extends BaseController { sysUserVo.setTenantId(sysUser.getTenantId()); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); + sysUserVo.setUsername(username); + sysUserVo.setUserType(UserTypeUtil.USER_TYPE); + sysUserVo.setUserTypeUtil(UserTypeUtil.USER); + sysUserVo.setUserid(sysUser.getUserId()); return R.ok(sysUserVo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 8e553c57..679b6328 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -27,6 +27,7 @@ + From 81f58eb0f4d926af972eac693cedf38f3dad99ad Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Mon, 10 Jan 2022 15:23:27 +0800 Subject: [PATCH 16/55] =?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 17/55] =?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 830d13a927feb18792369a48d71a5177b4bbbdb0 Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 12 Jan 2022 16:24:45 +0800 Subject: [PATCH 18/55] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=92=8C=E7=A7=9F=E6=88=B7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/common/util/UserTypeUtil.java | 3 + .../controller/XhpcAgreementController.java | 7 + .../controller/XhpcDictBizController.java | 3 + .../controller/XhpcEtTokenController.java | 4 + .../controller/XhpcHelpController.java | 6 + .../XhpcServiceDataUpdateController.java | 3 + .../resources/mapper/XhpcAgreementMapper.xml | 1 - .../resources/mapper/XhpcEtTokenMapper.xml | 1 - xhpc-modules/xhpc-order/pom.xml | 4 + .../order/api/XhpcChargeOrderController.java | 3 - ...ryOrderReconciliationStatusController.java | 3 + ...pcHistoryOrderSortingStatusController.java | 3 + .../controller/XhpcStatisticsController.java | 73 ++-- .../mapper/XhpcStatisticsServiceMapper.java | 24 +- .../order/service/IXhpcStatisticsService.java | 37 +- .../impl/XhpcStatisticsServiceImpl.java | 356 +++++++++--------- .../resources/mapper/XhpcStatisticsMapper.xml | 38 +- xhpc-modules/xhpc-payment/pom.xml | 4 + .../controller/AlipayPaymentController.java | 3 + .../controller/WxPaymentController.java | 3 + .../controller/XhpcRefundAuditController.java | 3 + .../controller/XhpcRefundOrderController.java | 3 + .../controller/XhpcCommunityController.java | 7 + .../controller/XhpcCustomersController.java | 10 + .../XhpcInternetUserController.java | 6 + .../controller/XhpcOperatorController.java | 6 + ...pcOperatorInternetBlacklistController.java | 3 + ...hpcStationInternetBlacklistController.java | 3 + .../user/controller/XhpcUserController.java | 9 + 29 files changed, 374 insertions(+), 255 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/UserTypeUtil.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/UserTypeUtil.java index d42975d1..f8e605f9 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/UserTypeUtil.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/UserTypeUtil.java @@ -88,5 +88,8 @@ public class UserTypeUtil { */ public static final String SYS_USER_TYPE_ZERO = "00"; public static final String SYS_USER_TYPE_ONE = "01"; + public static final String SYS_USER_TYPE_TWO = "02"; public static final String SYS_USER_TYPE_THREE = "03"; + + public static final Long SYS_USER_TYPE_ADMIN = 1L; } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java index a2756b26..1e63467d 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcAgreementController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.XhpcAgreement; import com.xhpc.general.service.IXhpcAgreementService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,18 +22,22 @@ public class XhpcAgreementController extends BaseController { @Autowired IXhpcAgreementService iXhpcAgreementService; + + @Log(title = "协议-删除", businessType = BusinessType.DELETE) @PostMapping("/delete") public AjaxResult delete(@RequestBody XhpcAgreement xhpcAgreement){ return iXhpcAgreementService.deleteAgreementItem(xhpcAgreement.getAgreementId()); } + @Log(title = "协议-添加", businessType = BusinessType.DELETE) @PostMapping("/add") public AjaxResult add(@RequestBody XhpcAgreement xhpcAgreement){ return iXhpcAgreementService.insertAgreementItem(xhpcAgreement.getTitle(),xhpcAgreement.getType(),xhpcAgreement.getContent()); } + @Log(title = "协议-编辑", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestBody XhpcAgreement xhpcAgreement){ @@ -51,6 +57,7 @@ public class XhpcAgreementController extends BaseController { return AjaxResult.success(iXhpcAgreementService.selectAgreementItem(agreementId)); } + @GetMapping("/getContent") public AjaxResult getContent(@RequestParam Integer type){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java index ae6e2d50..d92d5ea2 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcDictBizController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.XhpcDictionary; import com.xhpc.general.dto.XhpcDictionaryChild; import com.xhpc.general.service.IXhpcDictBizService; @@ -42,6 +44,7 @@ public class XhpcDictBizController extends BaseController { * @param sort the dictionary's sortValue * @return */ + @Log(title = "字典-添加", businessType = BusinessType.INSERT) @PostMapping("/addMainItem") public AjaxResult addMainDictionaryItem(@RequestBody XhpcDictionary xhpcDictionary){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java index 16360e06..96d6ded3 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcEtTokenController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.EtTokenEntity; import com.xhpc.general.service.IXhpcEtTokenService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +30,14 @@ public class XhpcEtTokenController extends BaseController { return getDataTable(iXhpcEtTokenService.list(operatorId, operatorId3irdpty)); } + @Log(title = "第三方token-删除", businessType = BusinessType.DELETE) @PostMapping(value = "/delete") public AjaxResult delete(@RequestBody EtTokenEntity etTokenEntity){ return iXhpcEtTokenService.delete(etTokenEntity.getId()); } + @Log(title = "第三方token-添加", businessType = BusinessType.INSERT) @PostMapping(value = "/add") public AjaxResult add(@RequestBody EtTokenEntity etTokenEntity){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java index a17144d5..6901de2d 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcHelpController.java @@ -3,6 +3,8 @@ package com.xhpc.general.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.domain.HelpEntity; import com.xhpc.general.service.IXhpcHelpService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,18 +24,22 @@ public class XhpcHelpController extends BaseController { @Autowired IXhpcHelpService iXhpcHelpService; + + @Log(title = "帮助-删除", businessType = BusinessType.DELETE) @PostMapping("/delete") public AjaxResult deleteHelpItem(@RequestBody HelpEntity helpEntity){ return iXhpcHelpService.deleteHelpItem(helpEntity.getHelpId()); } + @Log(title = "帮助-添加", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult insertHelpItem(@RequestBody HelpEntity helpEntity){ return iXhpcHelpService.insertHelpItem(helpEntity.getTitle(),helpEntity.getContent(),helpEntity.getType()); } + @Log(title = "帮助-修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult updateHelpItem(@RequestBody HelpEntity helpEntity){ diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java index 80703e03..58bf8604 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java @@ -1,6 +1,8 @@ package com.xhpc.general.controller; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.general.service.IXhpcServiceDataUpdateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,6 +25,7 @@ public class XhpcServiceDataUpdateController { return AjaxResult.success(xhpcServiceDataUpdateService.list()); } + @Log(title = "小程序设置-修改", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestParam(required = false) String SOC, @RequestParam(required = false) String version, @RequestParam(required = false) String phone, @RequestParam(required = false) String aliyunMessageCount) { diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml index 4966c1ec..533c8494 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml @@ -19,7 +19,6 @@ - update xhpc_agreement set del_flag=1 where agreement_id=#{agreementId} diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml index 94ab0063..823957d3 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcEtTokenMapper.xml @@ -34,7 +34,6 @@ - delete from et_auth_sec_token where id = #{id} diff --git a/xhpc-modules/xhpc-order/pom.xml b/xhpc-modules/xhpc-order/pom.xml index 121691b4..f1a31b0a 100644 --- a/xhpc-modules/xhpc-order/pom.xml +++ b/xhpc-modules/xhpc-order/pom.xml @@ -99,6 +99,10 @@ com.squareup.okhttp3 okhttp + + com.ruoyi + ruoyi-common-log + diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java index 78a7a2e0..142be756 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java @@ -1,6 +1,5 @@ package com.xhpc.order.api; -import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.xhpc.common.api.WebSocketService; import com.xhpc.common.core.web.controller.BaseController; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; -import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,7 +66,6 @@ public class XhpcChargeOrderController extends BaseController { } - /** * 启动充电 * @param userId diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index 04eeeede..01aaefeb 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -4,6 +4,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.order.service.IXhpcHistoryOrderReconciliationStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +27,7 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll * 修改对账状态 * @return */ + @Log(title = "对账-修改对账状态", businessType = BusinessType.UPDATE) @PostMapping("/status") @ApiOperation(value = "修改对账状态") public AjaxResult status(@RequestBody Map map) { diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java index cbb246fe..6c097111 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java @@ -5,6 +5,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.order.service.IXhpcHistoryOrderSortingStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,6 +29,7 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { * 修改清分状态 * @return */ + @Log(title = "清分-修改清分状态", businessType = BusinessType.UPDATE) @PostMapping("/status") @ApiOperation(value = "修改清分状态") public AjaxResult status(@RequestBody Map map) { diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java index c99ff053..52bc164b 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -42,9 +43,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTimeIntervalPage") - public TableDataInfo getTimeIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - List> list = xhpcStatisticsService.getTimeIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getTimeIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -60,9 +61,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getDateIntervalPage") - public TableDataInfo getDateIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getDateIntervalPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - List> list = xhpcStatisticsService.getDateIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getDateIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } /** @@ -78,9 +79,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getStationIntervalPage") - public TableDataInfo getStationIntervalPage(String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - List> list = xhpcStatisticsService.getStationIntervalPage(chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getStationIntervalPage(request,chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -95,9 +96,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getOperatorIntervalPage") - public TableDataInfo getOperatorIntervalPage(String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - List> list = xhpcStatisticsService.getOperatorIntervalPage(operatorIds,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getOperatorIntervalPage(request,operatorIds,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -112,10 +113,10 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getInternetUserIntervalPage") - public TableDataInfo getInternetUserIntervalPage(String internetUserIds,Long internetUserId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds,Long internetUserId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { startPage(); - List> list = xhpcStatisticsService.getInternetUserIntervalPage(internetUserIds,internetUserId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getInternetUserIntervalPage(request,internetUserIds,internetUserId,startTime,endTime,userId,type); return getDataTable(list); } @@ -132,9 +133,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTerminalIntervalPage") - public TableDataInfo getTerminalIntervalPage(String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public TableDataInfo getTerminalIntervalPage(HttpServletRequest request,String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - List> list = xhpcStatisticsService.getTerminalIntervalPage(chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); + List> list = xhpcStatisticsService.getTerminalIntervalPage(request,chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -146,12 +147,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getChargingStationList") - public AjaxResult getChargingStationList(Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==3) { return AjaxResult.success(); } - return xhpcStatisticsService.getChargingStationList(operatorId, userId, type); + return xhpcStatisticsService.getChargingStationList(request,operatorId, userId, type); } /** @@ -162,12 +163,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getOperatorList") - public AjaxResult getOperatorList(Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getOperatorList(HttpServletRequest request,Long operatorId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==3) { return AjaxResult.success(); } - return xhpcStatisticsService.getOperatorList(operatorId, userId, type); + return xhpcStatisticsService.getOperatorList(request,operatorId, userId, type); } /** @@ -178,12 +179,12 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getInternetUserIList") - public AjaxResult getInternetUserIList(Long internetUserId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) + public AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { if (type == null || type==2) { return AjaxResult.success(); } - return xhpcStatisticsService.getInternetUserIList(internetUserId, userId, type); + return xhpcStatisticsService.getInternetUserIList(request,internetUserId, userId, type); } /** @@ -194,11 +195,11 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getTerminalList") - public AjaxResult getTerminalList(Long chargingStationId, @RequestParam("userId") Long userId, @RequestParam("type") Integer type) { + public AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId, @RequestParam("userId") Long userId, @RequestParam("type") Integer type) { if (type == null || type == 3) { return AjaxResult.success(); } - return xhpcStatisticsService.getTerminalList(chargingStationId, userId, type); + return xhpcStatisticsService.getTerminalList(request,chargingStationId, userId, type); } /** @@ -208,8 +209,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getSourceList") - public AjaxResult getSourceList(@RequestParam("userId") Long userId, @RequestParam("type") Integer type) { - return xhpcStatisticsService.getSourceList(userId, type); + public AjaxResult getSourceList(HttpServletRequest request,@RequestParam("userId") Long userId, @RequestParam("type") Integer type) { + return xhpcStatisticsService.getSourceList(request,userId, type); } /** @@ -220,9 +221,9 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getSumSourceList") - public TableDataInfo getSumSourceList(String startTime, String endTime, String internetUserIds,@RequestParam("userId") Long userId, @RequestParam("type") Integer type, String chargingStationIds) { + public TableDataInfo getSumSourceList(HttpServletRequest request,String startTime, String endTime, String internetUserIds,@RequestParam("userId") Long userId, @RequestParam("type") Integer type, String chargingStationIds) { startPage(); - List> list = xhpcStatisticsService.getSumSourceList(startTime,endTime,internetUserIds,userId, type,chargingStationIds); + List> list = xhpcStatisticsService.getSumSourceList(request,startTime,endTime,internetUserIds,userId, type,chargingStationIds); return getDataTable(list); } @@ -242,8 +243,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/timeInterval/export") - public void timeIntervalExport(HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.timeIntervalExport(response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.timeIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** @@ -258,8 +259,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/dateInterval/export") - public void dateIntervalExport(HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.dateIntervalExport(response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.dateIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** * 电站统计导出 @@ -274,8 +275,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/stationInterval/export") - public void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.stationIntervalExport(response, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); + public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.stationIntervalExport(request,response, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); } /** @@ -289,8 +290,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/operatorInterval/export") - public void operatorIntervalExport(HttpServletResponse response, String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.operatorIntervalExport(response, operatorIds,operatorId,startTime,endTime,userId,type); + public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.operatorIntervalExport(request,response, operatorIds,operatorId,startTime,endTime,userId,type); } /** @@ -298,8 +299,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/internetUserInterval/export") - public void internetUserIntervalExport(HttpServletResponse response, String startTime, String endTime,String internetUserIds, @RequestParam("userId") Long userId, @RequestParam("type")Integer type, String chargingStationIds) throws IOException { - xhpcStatisticsService.getSumSourceListExport(response, startTime,endTime,internetUserIds,userId,type,chargingStationIds); + public void internetUserIntervalExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime,String internetUserIds, @RequestParam("userId") Long userId, @RequestParam("type")Integer type, String chargingStationIds) throws IOException { + xhpcStatisticsService.getSumSourceListExport(request,response, startTime,endTime,internetUserIds,userId,type,chargingStationIds); } @@ -315,8 +316,8 @@ public class XhpcStatisticsController extends BaseController { * @return */ @PostMapping("/terminalInterval/export") - public void terminalIntervalExport(HttpServletResponse response, String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { - xhpcStatisticsService.terminalIntervalExport(response, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); + public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { + xhpcStatisticsService.terminalIntervalExport(request,response, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java index a3667492..b36de127 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java @@ -27,7 +27,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTimeIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getTimeIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -40,7 +40,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getDateIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId); + List> getDateIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId,@Param("tenantId")String tenantId); /** * 电站统计 @@ -53,7 +53,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getStationIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("operatorUserId") List operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getStationIntervalPage(@Param("chargingStationIds") List chargingStationIds,@Param("operatorUserId") List operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** * 运营商统计 @@ -64,7 +64,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorIntervalPage(@Param("operatorUserId") List operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getOperatorIntervalPage(@Param("operatorUserId") List operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** * 流量方统计 @@ -75,7 +75,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIntervalPage(@Param("internetIds") List internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getInternetUserIntervalPage(@Param("internetIds") List internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -88,7 +88,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId); + List> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); /** @@ -98,7 +98,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getChargingStationList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type); + List> getChargingStationList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 运营商列表 @@ -107,7 +107,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type); + List> getOperatorList(@Param("operatorId")Long operatorId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** @@ -117,7 +117,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIList(@Param("internetUserId")Long internetUserId,@Param("userId")Long userId,@Param("type")Integer type); + List> getInternetUserIList(@Param("internetUserId")Long internetUserId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 终端列表 @@ -126,7 +126,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalList(@Param("chargingStationId")Long chargingStationId,@Param("userId")Long userId,@Param("type")Integer type); + List> getTerminalList(@Param("chargingStationId")Long chargingStationId,@Param("userId")Long userId,@Param("type")Integer type,@Param("tenantId")String tenantId); /** * 添加时段订单统计 @@ -144,7 +144,7 @@ public interface XhpcStatisticsServiceMapper { * 获取流量方列表 * @return */ - List> getInternetList(@Param("userId")Long userId); + List> getInternetList(@Param("userId")Long userId,@Param("tenantId")String tenantId); /** @@ -153,7 +153,7 @@ public interface XhpcStatisticsServiceMapper { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List chargingStationIdList); + List> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List chargingStationIdList,@Param("tenantId")String tenantId); /** * 获取登陆用户信息 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java index 4cf4c5c9..2210ef8f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java @@ -6,6 +6,7 @@ import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -29,7 +30,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTimeIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** @@ -43,7 +44,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getDateIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 电站统计 @@ -57,7 +58,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getStationIntervalPage(String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 运营商统计 @@ -69,7 +70,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getOperatorIntervalPage(String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getOperatorIntervalPage(HttpServletRequest request,String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type); /** @@ -82,7 +83,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getInternetUserIntervalPage(String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type); + List> getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type); /** @@ -96,7 +97,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getTerminalIntervalPage(String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type); + List> getTerminalIntervalPage(HttpServletRequest request,String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type); /** * 电站列表 @@ -105,7 +106,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getChargingStationList(Long operatorId,Long userId,Integer type); + AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId,Long userId,Integer type); /** * 运营商列表 @@ -114,7 +115,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getOperatorList(Long operatorId,Long userId,Integer type); + AjaxResult getOperatorList(HttpServletRequest request,Long operatorId,Long userId,Integer type); /** * 流量方列表 @@ -123,7 +124,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getInternetUserIList(Long internetUserId,Long userId,Integer type); + AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId,Long userId,Integer type); /** @@ -133,7 +134,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getTerminalList(Long chargingStationId,Long userId,Integer type); + AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId,Long userId,Integer type); /** * 订单来源列表 @@ -141,7 +142,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - AjaxResult getSourceList(Long userId,Integer type); + AjaxResult getSourceList(HttpServletRequest request,Long userId,Integer type); /** * 订单来源列表 @@ -149,7 +150,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - List> getSumSourceList(String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds); + List> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds); /** * 添加时段订单统计 @@ -180,7 +181,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void timeIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** @@ -194,7 +195,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void dateIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 电站统计导出 @@ -208,7 +209,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 运营商统计导出 @@ -220,14 +221,14 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void operatorIntervalExport(HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; /** * 订单来源统计导出 * @return */ - void getSumSourceListExport(HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException; + void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException; /** @@ -241,7 +242,7 @@ public interface IXhpcStatisticsService { * @param type 1 平台 2 运营商 3流量方 * @return */ - void terminalIntervalExport(HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; + void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index 61333dea..284ca74e 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -8,17 +8,22 @@ import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.service.BaseService; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.order.domain.XhpcStatisticsStation; import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import com.xhpc.order.mapper.XhpcStatisticsServiceMapper; import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcStatisticsService; +import com.xhpc.system.api.domain.SysUser; +import com.xhpc.system.api.model.LoginUser; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; @@ -35,8 +40,11 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati private XhpcStatisticsServiceMapper xhpcStatisticsServiceMapper; @Autowired private IXhpcHistoryOrderService xhpcHistoryOrderService; + @Autowired + private TokenService tokenService; + @Override - public List> getTimeIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -45,26 +53,24 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati chargingStationId= Arrays.asList(chargingStationIds.split(",")); } //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - startPage(); - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ startPage(); - list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); + list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } List> page =new ArrayList<>(); if(list !=null && list.size()>0){ @@ -159,7 +165,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati return page; } @Override - public List> getDateIntervalPage(String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -167,35 +173,33 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationId= Arrays.asList(chargingStationIds.split(",")); } - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + //获取登陆用户 List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - startPage(); - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ startPage(); - list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); + list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } return list; } @Override - public List> getStationIntervalPage(String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getStationIntervalPage(HttpServletRequest request,String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if (getJudge(internetUserId, operatorId, type)){ return new ArrayList<>(); } @@ -207,28 +211,24 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati if(!"".equals(operatorIds) && operatorIds !=null){ operatorUserId= Arrays.asList(operatorIds.split(",")); } - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - startPage(); - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); } }else{ startPage(); - list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,logUserId); + list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); } @@ -236,7 +236,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } @Override - public List> getOperatorIntervalPage(String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { if(getJudge(null,operatorId,type)){ return new ArrayList<>(); } @@ -244,35 +244,31 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati if(!"".equals(operatorIds) && operatorIds !=null){ operatorUserId= Arrays.asList(operatorIds.split(",")); } - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - startPage(); - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,logUserId); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ startPage(); - list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,logUserId); + list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } return list; } @Override - public List> getInternetUserIntervalPage(String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type) { + public List> getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds, Long internetUserId, String startTime, String endTime, Long userId, Integer type) { if(getJudge(internetUserId,null,type)){ return new ArrayList<>(); } @@ -280,36 +276,38 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati if(!"".equals(internetUserIds) && internetUserIds !=null){ internetIds= Arrays.asList(internetUserIds.split(",")); } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); // if(("".equals(startTime) && "".equals(endTime)) ||(startTime==null && endTime==null)){ // startTime =date(1); // endTime =date(2); // } - return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type,userId); + return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type,sysUserId,tenantId); } @Override - public List> getTerminalIntervalPage(String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { + public List> getTerminalIntervalPage(HttpServletRequest request,String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); List> list =new ArrayList<>(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - startPage(); - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 1,logOperatorId); - }else{ - //查询赋值的场站 - list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 2,logUserId); - } - } + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + startPage(); + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); + }else{ + //查询赋值的场站 + list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 2,sysUserId,tenantId); } }else{ startPage(); - list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,logUserId); + list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,sysUserId,tenantId); } @@ -317,114 +315,104 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } @Override - public AjaxResult getChargingStationList(Long operatorId, Long userId, Integer type) { - + public AjaxResult getChargingStationList(HttpServletRequest request,Long operatorId, Long userId, Integer type) { + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logUserId, 2)); - } - } + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, sysUserId, 0,tenantId)); } - return AjaxResult.success(); } @Override - public AjaxResult getOperatorList(Long operatorId, Long userId, Integer type) { + public AjaxResult getOperatorList(HttpServletRequest request,Long operatorId, Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logUserId, 2)); - } - } + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, sysUserId, 0,tenantId)); } - return AjaxResult.success(); } @Override - public AjaxResult getInternetUserIList(Long internetUserId, Long userId, Integer type) { - return AjaxResult.success(xhpcStatisticsServiceMapper.getInternetUserIList(internetUserId, userId, type)); + public AjaxResult getInternetUserIList(HttpServletRequest request,Long internetUserId, Long userId, Integer type) { + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + return AjaxResult.success(xhpcStatisticsServiceMapper.getInternetUserIList(internetUserId, sysUserId, type,tenantId)); } @Override - public AjaxResult getTerminalList(Long chargingStationId, Long userId, Integer type) { - - //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); - if(logUserId !=1){ - Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); - if(landUser !=null){ - if(landUser.get("userType") !=null){ - if("01".equals(landUser.get("userType").toString())){ - Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); - //运营商看自己的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logOperatorId, 1)); - }else{ - //查询赋值的场站 - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logUserId, 2)); - } - } + public AjaxResult getTerminalList(HttpServletRequest request,Long chargingStationId, Long userId, Integer type) { +//获取登陆用户 + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logOperatorId, 1,tenantId)); + }else{ + //查询赋值的场站 + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, sysUserId, 2,tenantId)); } }else{ - return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logUserId, 0)); + return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, sysUserId, 0,tenantId)); } - - - - return AjaxResult.success(); } @Override - public AjaxResult getSourceList(Long userId, Integer type) { + public AjaxResult getSourceList(HttpServletRequest request,Long userId, Integer type) { //获取登陆用户 - Long logUserId = SecurityUtils.getUserId(); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); //桩的统计、该时段金额 List> list = new ArrayList<>(); - Map landUser = xhpcStatisticsServiceMapper.getLandUser(logUserId); - if (landUser != null) { - if (landUser.get("userType") != null && "02".equals(landUser.get("userType").toString())) { - list = xhpcStatisticsServiceMapper.getInternetList(logUserId); - }else{ - list = xhpcStatisticsServiceMapper.getInternetList(null); - Map map1 =new HashMap<>(); - Map map2 =new HashMap<>(); - map1.put("name","微信"); - map1.put("id","微信"); - map2.put("name","支付宝"); - map2.put("id","支付宝"); - list.add(map1); - list.add(map2); - } + if (UserTypeUtil.SYS_USER_TYPE_TWO.equals(sysUser.getUserType())) { + list = xhpcStatisticsServiceMapper.getInternetList(sysUserId,tenantId); + }else{ + list = xhpcStatisticsServiceMapper.getInternetList(null,tenantId); + Map map1 =new HashMap<>(); + Map map2 =new HashMap<>(); + map1.put("name","微信"); + map1.put("id","微信"); + map2.put("name","支付宝"); + map2.put("id","支付宝"); + list.add(map1); + list.add(map2); } return AjaxResult.success(list); } @Override - public List> getSumSourceList(String startTime, String endTime, String sourceIds, Long userId, Integer type,String chargingStationIds) { + public List> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds, Long userId, Integer type,String chargingStationIds) { List sourceList =new ArrayList<>(); if(!"".equals(sourceIds) && sourceIds !=null){ sourceList= Arrays.asList(sourceIds.split(",")); @@ -433,7 +421,11 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati if(!"".equals(chargingStationIds) && chargingStationIds !=null){ chargingStationIdList= Arrays.asList(chargingStationIds.split(",")); } - return xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, userId, type,chargingStationIdList); + LoginUser loginUser = tokenService.getLoginUser(request); + SysUser sysUser = loginUser.getSysUser(); + String tenantId = loginUser.getTenantId(); + Long sysUserId = sysUser.getUserId(); + return xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, sysUserId, type,chargingStationIdList,tenantId); } @Override @@ -507,8 +499,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override - public void timeIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getTimeIntervalPage(chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getTimeIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -546,8 +538,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override - public void dateIntervalExport(HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getDateIntervalPage(chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getDateIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -588,8 +580,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } @Override - public void stationIntervalExport(HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getStationIntervalPage(chargingStationIds, operatorIds, internetUserId, operatorId, startTime, endTime, userId, type); + public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getStationIntervalPage(request,chargingStationIds, operatorIds, internetUserId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -632,8 +624,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } @Override - public void operatorIntervalExport(HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getOperatorIntervalPage(operatorIds, operatorId, startTime, endTime, userId, type); + public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getOperatorIntervalPage(request,operatorIds, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -676,9 +668,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override - public void getSumSourceListExport(HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException { + public void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds,Long userId,Integer type, String chargingStationIds) throws IOException { - List> list = getSumSourceList(startTime, endTime, sourceIds, userId, type,chargingStationIds); + List> list = getSumSourceList(request,startTime, endTime, sourceIds, userId, type,chargingStationIds); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); @@ -721,8 +713,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati @Override - public void terminalIntervalExport(HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { - List> list = getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, userId, type); + public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { + List> list = getTerminalIntervalPage(request,chargingStationId, terminalId, operatorId, startTime, endTime, userId, type); // 通过工具类创建writer，默认创建xls格式 ExcelWriter writer = ExcelUtil.getWriter(true); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index e81c2180..e6bd2a26 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -101,6 +101,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + group by status order by status @@ -145,6 +148,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + group by DATE_FORMAT(create_time,'%Y-%m-%d') order by DATE_FORMAT(create_time,'%Y-%m-%d') desc @@ -199,6 +205,9 @@ #{operatorId} + + and ss.tenant_id = #{tenantId} + group by ss.charging_station_id @@ -244,6 +253,9 @@ and ss.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and ss.tenant_id = #{tenantId} + group by ss.operator_id @@ -286,6 +298,9 @@ and ss.internet_user_id =#{internetUserId} + + and ss.tenant_id = #{tenantId} + group by ss.internet_user_id @@ -333,6 +348,9 @@ and ss.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and ss.tenant_id = #{tenantId} + group by ss.terminal_id @@ -348,6 +366,9 @@ and charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId}) + + and tenant_id = #{tenantId} + @@ -357,13 +378,15 @@ name as operatorName from xhpc_operator where 1=1 - and operator_id in (select operator_id from xhpc_charging_station where operator_id=#{userId}) and operator_id in (select operator_id from xhpc_charging_station where charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{userId})) + + and tenant_id = #{tenantId} + @@ -766,6 +794,9 @@ and internet_user_id=#{userId} + + and tenant_id = #{tenantId} + diff --git a/xhpc-modules/xhpc-payment/pom.xml b/xhpc-modules/xhpc-payment/pom.xml index bb3ef119..3c43cfbf 100644 --- a/xhpc-modules/xhpc-payment/pom.xml +++ b/xhpc-modules/xhpc-payment/pom.xml @@ -81,6 +81,10 @@ 3.0.0 compile + + com.ruoyi + ruoyi-common-log + diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java index 855dab4a..9c18eb43 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java @@ -35,6 +35,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -68,6 +70,7 @@ public class AlipayPaymentController { private static final Logger logger = LoggerFactory.getLogger(AlipayPaymentController.class); + @Log(title = "支付宝-支付", businessType = BusinessType.INSERT) @NoRepeatSubmit @PostMapping("/payment") @ApiOperation(value = "支付宝支付") diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java index 0d418809..c1af930b 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java @@ -10,6 +10,8 @@ import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.utils.WXPayUtil; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.data.down.StartChargingData; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; @@ -78,6 +80,7 @@ public class WxPaymentController { private static final Logger logger = LoggerFactory.getLogger(WxPaymentController.class); + @Log(title = "微信-支付", businessType = BusinessType.INSERT) @NoRepeatSubmit @PostMapping("/payment") @ApiOperation(value = "微信支付") diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java index 0a380825..90158226 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java @@ -18,6 +18,8 @@ import com.xhpc.common.core.utils.WXPayUtil; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.domain.XhpcAppUser; @@ -99,6 +101,7 @@ public class XhpcRefundAuditController extends BaseController { * @param xhpcRefundAudit * @return */ + @Log(title = "退款-审核", businessType = BusinessType.UPDATE) @PostMapping("/examine") @ApiOperation(value = "退款审核") @Transactional diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java index 5a894afb..cdc749ac 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java @@ -8,6 +8,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.service.IXhpcCommonPayment; @@ -44,6 +46,7 @@ public class XhpcRefundOrderController extends BaseController { * * @return */ + @Log(title = "申请退款", businessType = BusinessType.INSERT) @NoRepeatSubmit @PostMapping("/checkOut") @ApiOperation(value = "申请退款") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java index e70eb708..9f16aa45 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java @@ -49,6 +49,7 @@ public class XhpcCommunityController extends BaseController { /** * 删除社区组树 */ + @Log(title = "社区", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCommunity") public AjaxResult deleteCommunity(@RequestBody XhpcCommunity xhpcCommunity) { return xhpcCommunityService.deleteCommunity(xhpcCommunity); @@ -67,6 +68,7 @@ public class XhpcCommunityController extends BaseController { * * @return */ + @Log(title = "社区", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunity") public AjaxResult updateCommunity(@RequestBody XhpcCommunity xhpcCommunity) { return xhpcCommunityService.updateCommunity(xhpcCommunity); @@ -89,6 +91,7 @@ public class XhpcCommunityController extends BaseController { * 社区人员添加 * */ + @Log(title = "社区人员", businessType = BusinessType.INSERT) @PostMapping(value = "/addCommunityPersonnel") public AjaxResult addCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.addCommunityPersonnel(xhpcCommunityPersonnel); @@ -107,6 +110,7 @@ public class XhpcCommunityController extends BaseController { * 编辑社区人员 * */ + @Log(title = "社区人员", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunityPersonnel") public AjaxResult updateCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.updateCommunityPersonnel(xhpcCommunityPersonnel); @@ -115,6 +119,7 @@ public class XhpcCommunityController extends BaseController { /** * 删除社区人员 */ + @Log(title = "社区人员", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCommunityPersonnel") public AjaxResult deleteCommunityPersonnel(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { xhpcCommunityService.deleteCommunityPersonnel(xhpcCommunityPersonnel); @@ -124,6 +129,7 @@ public class XhpcCommunityController extends BaseController { /** * 改变社区人员状态 */ + @Log(title = "社区人员-状态", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCommunityPersonnelStatus") public AjaxResult updateCommunityPersonnelStatus(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { xhpcCommunityService.updateCommunityPersonnelStatus(xhpcCommunityPersonnel); @@ -133,6 +139,7 @@ public class XhpcCommunityController extends BaseController { /** * 充值 */ + @Log(title = "社区人员-充值", businessType = BusinessType.INSERT) @PostMapping(value = "/addRecharge") public AjaxResult addRecharge(@RequestBody XhpcCommunityPersonnel xhpcCommunityPersonnel) { return xhpcCommunityService.addRecharge(xhpcCommunityPersonnel); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java index baf20483..b36c2cb4 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcCustomers; import com.xhpc.user.domain.XhpcCustomersPersonnel; import com.xhpc.user.service.IXhpcCustomersService; @@ -39,6 +41,7 @@ public class XhpcCustomersController extends BaseController { * * @return */ + @Log(title = "大客户组", businessType = BusinessType.INSERT) @PostMapping(value = "/addCustomers") public AjaxResult addCustomers(HttpServletRequest request, @RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.addCustomers(request,xhpcCustomers); @@ -47,6 +50,7 @@ public class XhpcCustomersController extends BaseController { /** * 删除大客户 */ + @Log(title = "大客户组", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCustomers") public AjaxResult deleteCustomers(@RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.deleteCustomers(xhpcCustomers); @@ -65,6 +69,7 @@ public class XhpcCustomersController extends BaseController { * * @return */ + @Log(title = "大客户组", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomers") public AjaxResult updateCustomers(@RequestBody XhpcCustomers xhpcCustomers) { return xhpcCustomersService.updateCustomers(xhpcCustomers); @@ -83,6 +88,7 @@ public class XhpcCustomersController extends BaseController { * 大客户人员添加 * */ + @Log(title = "大客户人员", businessType = BusinessType.INSERT) @PostMapping(value = "/addCustomersPersonnel") public AjaxResult addCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.addCustomersPersonnel(xhpcCustomersPersonnel); @@ -101,6 +107,7 @@ public class XhpcCustomersController extends BaseController { * 编辑大客户人员 * */ + @Log(title = "大客户人员", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomersPersonnel") public AjaxResult updateCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.updateCustomersPersonnel(xhpcCustomersPersonnel); @@ -109,6 +116,7 @@ public class XhpcCustomersController extends BaseController { /** * 删除社区人员 */ + @Log(title = "大客户人员", businessType = BusinessType.DELETE) @PostMapping(value = "/deleteCustomersPersonnel") public AjaxResult deleteCustomersPersonnel(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersService.deleteCustomersPersonnel(xhpcCustomersPersonnel); @@ -118,6 +126,7 @@ public class XhpcCustomersController extends BaseController { /** * 充值 */ + @Log(title = "大客户人员-充值", businessType = BusinessType.INSERT) @PostMapping(value = "/addRecharge") public AjaxResult addRecharge(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { return xhpcCustomersService.addRecharge(xhpcCustomersPersonnel); @@ -126,6 +135,7 @@ public class XhpcCustomersController extends BaseController { /** * 改变社区人员状态 */ + @Log(title = "大客户人员-状态", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateCustomersPersonnelStatus") public AjaxResult updateCustomersPersonnelStatus(@RequestBody XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersService.updateCustomersPersonnelStatus(xhpcCustomersPersonnel); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 249a49ec..530a4432 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -8,6 +8,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcInternetUser; @@ -43,6 +45,7 @@ public class XhpcInternetUserController extends BaseController { /** * 新增流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.INSERT) @ApiOperation("新增流量用户") @RequiresRoles("admin") @PostMapping("/add") @@ -81,6 +84,7 @@ public class XhpcInternetUserController extends BaseController { /** * 修改流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.UPDATE) @ApiOperation("修改流量用户") @RequiresRoles("admin") @PostMapping("/edit") @@ -118,6 +122,7 @@ public class XhpcInternetUserController extends BaseController { /** * 删除流量用户 */ + @Log(title = "流量用户", businessType = BusinessType.DELETE) @ApiOperation("删除流量用户") @RequiresRoles("admin") @PostMapping("/remove") @@ -154,6 +159,7 @@ public class XhpcInternetUserController extends BaseController { /** * 禁用/启用流量用户 */ + @Log(title = "流量用户-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用流量用户") @RequiresRoles("admin") @PostMapping("/status") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index e3cfe8b1..5a3e9b1e 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -7,6 +7,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcOperator; @@ -40,6 +42,7 @@ public class XhpcOperatorController extends BaseController { /** * 新增运营商 */ + @Log(title = "运营商", businessType = BusinessType.INSERT) @ApiOperation("新增运营商") @RequiresRoles("admin") @PostMapping("/add") @@ -101,6 +104,7 @@ public class XhpcOperatorController extends BaseController { /** * 修改运营商 */ + @Log(title = "运营商", businessType = BusinessType.UPDATE) @ApiOperation("修改运营商") @PreAuthorize(hasPermi = "user:operator:edit") @RequiresRoles("admin") @@ -121,6 +125,7 @@ public class XhpcOperatorController extends BaseController { /** * 删除运营商 */ + @Log(title = "运营商", businessType = BusinessType.DELETE) @ApiOperation("删除运营商") @RequiresRoles("admin") @PostMapping("/remove") @@ -157,6 +162,7 @@ public class XhpcOperatorController extends BaseController { /** * 禁用/启用运营商 */ + @Log(title = "运营商-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用运营商") @RequiresRoles("admin") @PostMapping("/status") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java index efc9cb8f..924051c7 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcOperatorInternetBlacklist; import com.xhpc.user.service.IXhpcOperatorInternetBlacklistService; import io.swagger.annotations.ApiOperation; @@ -28,6 +30,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController { /** * 新增运营商设置流量方黑名单 */ + @Log(title = "运营商-设置流量方黑名单", businessType = BusinessType.INSERT) @ApiOperation("新增运营商设置流量方黑名单") //@PreAuthorize(hasPermi = "operator:internet:add") @PostMapping("/add") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java index 6be2c863..a81417db 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java @@ -3,6 +3,8 @@ package com.xhpc.user.controller; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.user.domain.XhpcStationInternetBlacklist; import com.xhpc.user.service.IXhpcInternetUserService; import com.xhpc.user.service.IXhpcStationInternetBlacklistService; @@ -32,6 +34,7 @@ public class XhpcStationInternetBlacklistController extends BaseController { /** * 新增电站流量方黑名单 */ + @Log(title = "场站-设置流量方黑名单", businessType = BusinessType.INSERT) @ApiOperation("新增电站流量方黑名单") // @PreAuthorize(hasPermi = "station:internet:add") @PostMapping("/add") diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java index fc97e669..9a07b170 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java @@ -7,6 +7,8 @@ import com.xhpc.common.core.utils.StringUtils; 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.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; @@ -52,6 +54,7 @@ public class XhpcUserController extends BaseController { /** * 新增平台用户 */ + @Log(title = "平台用户", businessType = BusinessType.INSERT) @ApiOperation("新增平台用户") @RequiresRoles("admin") @PostMapping("/pc/add") @@ -82,6 +85,7 @@ public class XhpcUserController extends BaseController { /** * 修改平台用户 */ + @Log(title = "平台用户", businessType = BusinessType.UPDATE) @ApiOperation("修改平台用户") @RequiresRoles("admin") @PostMapping("/pc/edit") @@ -122,6 +126,7 @@ public class XhpcUserController extends BaseController { /** * 新增运营商用户 */ + @Log(title = "运营商用户", businessType = BusinessType.INSERT) @ApiOperation("新增运营商用户") @RequiresPermissions("user:operator:add") @PostMapping("/operator/add") @@ -154,6 +159,7 @@ public class XhpcUserController extends BaseController { /** * 修改运营商用户 */ + @Log(title = "运营商用户", businessType = BusinessType.UPDATE) @ApiOperation("修改运营商用户") @RequiresPermissions("user:operator:edit") @PostMapping("/operator/edit") @@ -181,6 +187,7 @@ public class XhpcUserController extends BaseController { /** * 禁用/启用平台和运营商子账号 */ + @Log(title = "平台和运营商子账号-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用平台和运营商子账号") //@PreAuthorize(hasPermi = "user:pc:status") @PostMapping("/status") @@ -196,6 +203,7 @@ public class XhpcUserController extends BaseController { /** * 禁用/启用平台和运营商子账号 */ + @Log(title = "平台和运营商子账号-禁用启用", businessType = BusinessType.UPDATE) @ApiOperation("禁用/启用平台和运营商子账号") //@PreAuthorize(hasPermi = "user:pc:status") @PostMapping("/remove") @@ -212,6 +220,7 @@ public class XhpcUserController extends BaseController { /** * 重置密码 */ + @Log(title = "重置密码", businessType = BusinessType.UPDATE) @PostMapping("/reset") public AjaxResult reset(@RequestParam Long userId){ From 1b3bd6da3c7d8816d393217405441ce9b4117864 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 12 Jan 2022 18:19:25 +0800 Subject: [PATCH 19/55] =?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 20/55] =?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 From ef99658e6ce7425d81ab158a3b2e2b2bb216bd6c Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 13 Jan 2022 09:48:20 +0800 Subject: [PATCH 21/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E5=B9=B6?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/domain/XhpcDeviceMessage.java | 19 --------------- .../logic/BmsChargerInterruptDataLogic.java | 23 ------------------- .../logic/BmsChargingCompletedDataLogic.java | 21 ----------------- .../pp/logic/BmsChargingConfigDataLogic.java | 20 ---------------- .../logic/BmsChargingHandshakeDataLogic.java | 20 ---------------- .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 23 +------------------ .../xhpc/pp/logic/BmsInterruptDataLogic.java | 23 +------------------ .../logic/RateModelConfigReplyDataLogic.java | 4 ---- .../xhpc/pp/logic/RateModelRequestLogic.java | 4 ---- .../xhpc/pp/logic/RateModelValidateLogic.java | 4 ---- .../java/com/xhpc/pp/logic/RegisterLogic.java | 4 ---- .../mapper/XhpcDeviceMessageMapper.xml | 16 +------------ 12 files changed, 3 insertions(+), 178 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 1938b4ac..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,20 +8,6 @@ import java.util.Date; @Data public class XhpcDeviceMessage { -<<<<<<< HEAD - private Long deviceMessageId; - - private String type; - - private String serialNumber; - - private String content; - - private String replyContent; - - private Integer status; - -======= /** * 消息ID */ @@ -57,7 +43,6 @@ public class XhpcDeviceMessage { */ private String remark; ->>>>>>> log private Date createTime; private String createBy; @@ -66,8 +51,4 @@ public class XhpcDeviceMessage { private String updateBy; -<<<<<<< HEAD - private String remark; -======= ->>>>>>> log } 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 e8ce4e5c..8b28e1f2 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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -25,12 +19,7 @@ import java.util.Map; public class BmsChargerInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class); -<<<<<<< HEAD - @Autowired - private XhpcMessageMapper xhpcMessageMapper; -======= ->>>>>>> log @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -38,25 +27,13 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段充电机中止报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); -======= ->>>>>>> log - 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")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log 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 a65e668b..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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -29,22 +23,10 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { @Resource XhpcDeviceMessageMapper deviceMessageMapper; - @Resource - XhpcDeviceMessageMapper deviceMessageMapper; - @Override public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电结束阶段报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); - -======= ->>>>>>> log XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -52,10 +34,7 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log 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 7eb71ba2..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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -29,22 +23,11 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { @Resource XhpcDeviceMessageMapper deviceMessageMapper; - @Resource - XhpcDeviceMessageMapper deviceMessageMapper; - @Override public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 参数配置阶段报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); -======= ->>>>>>> log XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -52,10 +35,7 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log 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 dc10c384..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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -29,22 +23,11 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { @Resource XhpcDeviceMessageMapper deviceMessageMapper; - @Resource - XhpcDeviceMessageMapper deviceMessageMapper; - @Override public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电握手阶段报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); -======= ->>>>>>> log XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -52,10 +35,7 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log 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 e4620b5b..5895bad2 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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -25,12 +19,7 @@ import java.util.Map; public class BmsErrorDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class); -<<<<<<< HEAD - @Autowired - private XhpcMessageMapper xhpcMessageMapper; -======= ->>>>>>> log @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -38,14 +27,6 @@ public class BmsErrorDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电错误报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); -======= ->>>>>>> log XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -53,10 +34,8 @@ public class BmsErrorDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log + 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 c65dd592..b99ac2f5 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,13 +1,7 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -<<<<<<< HEAD -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; -======= -import com.xhpc.pp.domain.XhpcDeviceMessage; ->>>>>>> log import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; @@ -25,12 +19,7 @@ import java.util.Map; public class BmsInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class); -<<<<<<< HEAD - @Autowired - private XhpcMessageMapper xhpcMessageMapper; -======= ->>>>>>> log @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -38,14 +27,6 @@ public class BmsInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段 BMS 中止报文"; Map req = sp.getParameters(); -<<<<<<< HEAD - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); -======= ->>>>>>> log XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -53,10 +34,8 @@ public class BmsInterruptDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD -======= deviceMessage.setChargeOrderNo((String) req.get("orderNo")); ->>>>>>> log + 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 cea17cc9..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,10 +55,6 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD - deviceMessage.setReplyContent(result); -======= ->>>>>>> log 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 6aabb188..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,10 +56,6 @@ public class RateModelRequestLogic implements ServiceLogic { deviceMessage.setRemark("充电桩计费模型请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD - deviceMessage.setReplyContent(resultStr); -======= ->>>>>>> log 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 7c555220..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,10 +72,6 @@ public class RateModelValidateLogic implements ServiceLogic { deviceMessage.setRemark("计费模型验证请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD - deviceMessage.setReplyContent(resultStr); -======= ->>>>>>> log 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 bd651773..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,10 +91,6 @@ public class RegisterLogic implements ServiceLogic { deviceMessage.setRemark("充电桩登录认证"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); -<<<<<<< HEAD - deviceMessage.setReplyContent(resultStr); -======= ->>>>>>> log deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); 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 3faba92b..f2423716 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,11 +8,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> log @@ -23,17 +19,11 @@ insert into xhpc_device_message( -<<<<<<< HEAD - type, - serial_number, - content, - reply_content, -======= + type, serial_number, content, charge_order_no, ->>>>>>> log status, create_by, remark, @@ -44,11 +34,7 @@ #{type}, #{serialNumber}, #{content}, -<<<<<<< HEAD - #{replyContent}, -======= #{chargeOrderNo}, ->>>>>>> log #{status}, #{createBy}, #{remark}, From 5c0218bba4ece497b32fa36057a953ca8ed5c6bb Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 13 Jan 2022 10:44:50 +0800 Subject: [PATCH 22/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/XhpcDeviceMessageMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2423716..656847e2 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 @@ -31,7 +31,7 @@ create_time, update_time )values( - #{type}, + #{type}, #{serialNumber}, #{content}, #{chargeOrderNo}, From aaa36fa9b48a0ee3e371be9d6131e2e0336ab67a Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 13 Jan 2022 11:12:03 +0800 Subject: [PATCH 23/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9deviceMapper=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/{pp => }/mapper/XhpcDeviceMessageMapper.java | 2 +- .../main/java/com/xhpc/pp/controller/ChargingController.java | 2 +- .../java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java | 2 +- .../main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java | 2 +- .../com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java | 2 +- .../main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java | 2 +- .../main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RegisterLogic.java | 2 +- .../java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java | 2 +- .../main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java | 2 +- .../src/main/java/com/xhpc/pp/server/HBCheckTask.java | 2 +- .../src/main/resources/mapper/XhpcDeviceMessageMapper.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) rename xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/{pp => }/mapper/XhpcDeviceMessageMapper.java (90%) 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/mapper/XhpcDeviceMessageMapper.java similarity index 90% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java index a0f2fb54..382e89e2 100644 --- 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/mapper/XhpcDeviceMessageMapper.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.mapper; +package com.xhpc.mapper; import com.xhpc.pp.domain.XhpcDeviceMessage; 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 adf450b4..cc720066 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 @@ -11,7 +11,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.utils.HexUtils; import com.xhpc.pp.utils.security.CRCCalculator; 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 ba79e1ae..d74e45fe 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 8b28e1f2..f91f8a46 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 215beb0c..d177fa96 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 612cd9f8..940825ac 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 85a72517..2976e2bb 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 17f00ea6..18c70ce9 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 5895bad2..71b22460 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 b99ac2f5..715cefd6 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 7e1fcbc0..f5a0e61c 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 bb063596..31912978 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 35cc7aac..784ce841 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 @@ -2,7 +2,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 58722743..1b7fd7da 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 26ea5a1d..09a34622 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 d6b0b655..6ffe0846 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 8f3c89a0..b4b91e62 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 @@ -5,7 +5,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 19c0feca..5065694e 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 @@ -5,7 +5,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 9502f806..97875b0d 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 @@ -6,7 +6,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 b2ad2891..bcf50f03 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 @@ -3,7 +3,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 417859f2..252c3af4 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 @@ -3,7 +3,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 12137040..808bc2b5 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 e28856fa..0c3c4376 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 @@ -4,7 +4,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; 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 145efa30..90479c18 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 @@ -8,7 +8,7 @@ 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.TxException; 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 6fc1d521..f371b1c9 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 @@ -4,7 +4,7 @@ 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 com.xhpc.mapper.XhpcDeviceMessageMapper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; 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 656847e2..9f546975 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 @@ -1,7 +1,7 @@ - + From f44f7571ba3a049c4cd0803d0391dda929bedc6c Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 13 Jan 2022 11:54:53 +0800 Subject: [PATCH 24/55] =?UTF-8?q?xml=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/XhpcAppUserMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml index cd7d2321..0285419a 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -167,9 +167,9 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - soc = #{soc} - is_refund = #{isRefund} - soc_protect = #{socProtect} + soc = #{soc}, + is_refund = #{isRefund}, + soc_protect = #{socProtect}, WHERE app_user_id = #{appUserId} From 1311d4fdff8b9267fe80ea43ab0da0b7da0d4fba Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 12:48:36 +0800 Subject: [PATCH 25/55] =?UTF-8?q?=E7=89=B9=E5=88=AB=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/server/ChargingPileBinaryHandler.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 90479c18..70e23b88 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 @@ -4,11 +4,11 @@ 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.mapper.XhpcDeviceMessageMapper; 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.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.TxException; @@ -21,7 +21,6 @@ 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.*; @@ -51,15 +50,13 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { // private static final String DATA_TYPE_HEX = "hex"; private final ServiceMainLogic servicemainLogic; - - - @Resource - XhpcDeviceMessageMapper deviceMessageMapper; + private final XhpcDeviceMessageMapper xhpcDeviceMessageMapper; public ChargingPileBinaryHandler() { servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic"); + xhpcDeviceMessageMapper = SpringContextHolder.getBean(XhpcDeviceMessageMapper.class); } @Override @@ -130,7 +127,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { deviceMessage.setStatus(0); deviceMessage.setContent(HexUtils.toString(result.getBinary())); deviceMessage.setChargeOrderNo((String) req.get("orderNo")); - deviceMessageMapper.insertByDomain(deviceMessage); + xhpcDeviceMessageMapper.insertByDomain(deviceMessage); } if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) { Boolean tcfg = (Boolean) cachePile.get("tcfg"); From bf7bfed112c95d851b9b8f69adc6ff864b56786b Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 13 Jan 2022 14:21:45 +0800 Subject: [PATCH 26/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E3=80=81=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/order/api/XhpcPileOrderController.java | 2 +- .../controller/XhpcHistoryOrderController.java | 2 +- .../order/service/IXhpcHistoryOrderService.java | 2 +- .../service/impl/XhpcHistoryOrderServiceImpl.java | 2 +- .../impl/XhpcUserAccountStatementServiceImpl.java | 14 ++++++++------ .../mapper/XhpcUserAccountStatementMapper.xml | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 7856827a..3e50d7fd 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -436,7 +436,7 @@ public class XhpcPileOrderController extends BaseController { R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null || userMessage.get("balance") == null) { + if (userMessage != null && userMessage.get("balance") != null) { xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,orderNo,1); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index bca87578..75aa172f 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -877,7 +877,7 @@ public class XhpcHistoryOrderController extends BaseController { R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null || userMessage.get("balance") == null) { + if (userMessage != null && userMessage.get("balance") != null) { xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,xhpcChargeOrder.getSerialNumber(),2); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java index 57e1867e..7d702184 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java @@ -19,7 +19,7 @@ public interface IXhpcHistoryOrderService { /** * 用户历史订单表 - * @param userId + * @param * @return */ List> list(HttpServletRequest request); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 4b339a87..d49637f9 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -87,7 +87,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { startPage(); return xhpcHistoryOrderMapper.list(userid,userType,tenantId); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java index 4dbacb4c..b81f41e0 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java @@ -6,10 +6,13 @@ import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.security.service.TokenService; +import com.xhpc.payment.controller.AlipayPaymentController; import com.xhpc.payment.domain.XhpcUserAccountStatement; import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper; import com.xhpc.payment.service.IXhpcUserAccountStatementService; import com.xhpc.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,7 +39,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements @Autowired private TokenService tokenService; - + private static final Logger logger = LoggerFactory.getLogger(XhpcUserAccountStatementServiceImpl.class); /** * 新增 用户流水 * @@ -51,7 +54,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements /** * 用户流水分页列表 * - * @param appUserId C端用户id + * @param C端用户id * @return */ @Override @@ -64,13 +67,12 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { startPage(); return xhpcUserAccountStatementMapper.page(userid,userType,tenantId); } } return list; - //return xhpcUserAccountStatementMapper.page(appUserId); } /** @@ -115,7 +117,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements /** * 用户流水列表 * - * @param appUserId C端用户id + * @param C端用户id * @return */ @Override @@ -129,7 +131,7 @@ public class XhpcUserAccountStatementServiceImpl extends BaseService implements R user = userTypeService.getUser(null, userid, userType, null, tenantId); if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); - if (userMessage == null) { + if (userMessage != null) { return xhpcUserAccountStatementMapper.list(userid,userType,tenantId); } } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index 0f020fd3..4c20481c 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -188,10 +188,10 @@ and xau.app_user_id = #{appUserId} - and xau.tenant_id = #{tenantId} + and xuas.tenant_id = #{tenantId} - and xau.source = #{source} + and xuas.source = #{source} ORDER BY xuas.create_time DESC From 4464e2aec0ecc108444d85cf01fa445e2bce8d5b Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 16:21:34 +0800 Subject: [PATCH 27/55] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AEsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/test-opsecret.sql | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 sql/test-opsecret.sql diff --git a/sql/test-opsecret.sql b/sql/test-opsecret.sql new file mode 100644 index 00000000..b707aaa1 --- /dev/null +++ b/sql/test-opsecret.sql @@ -0,0 +1,24 @@ +INSERT INTO `ry-cloud`.et_auth_sec_token (name, operator_id, operator_id3irdpty, secret_token_type, token, token_expiry, + data_secret, data_secretiv, operator_secret, sig_secret, encrypt, url_prefix, + last_push_order, tenant_id) +VALUES ('成都市平台', 'MA6DFCTD5', '765367656', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://hlht.cd-test.zcsy-inc.cn/evcs/20160701', NULL, '000000'), + (NULL, 'MA6DFCTD5', '765367656', 'OUT', NULL, NULL, + '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', 'wAeYIVQUwd0iGZsV', 1, + 'http://hlht.cd-test.zcsy-inc.cn/evcs/20160701', INTENDED, '000000'), + ('恒大', 'MA6DFCTD5', 'MA5FF58R7', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://119.23.185.48:9268/evcs/v1/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA5FF58R7', 'OUT', NULL, NULL, '134714FB204A2CD1', '134707EDE37275E7', 'B8E66A501605A3C0', + '218A622D09620801', 1, 'http://119.23.185.48:9268/evcs/v1/', NULL, '000000'), + ('快电', 'MA6DFCTD5', 'MA005DBW1', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://dev-charge-hub-ws-qq.gokuaidian.com/evcs/v1.0/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA005DBW1', 'OUT', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://dev-charge-hub-ws-qq.gokuaidian.com/evcs/v1.0/', NULL, '000000'), + ('新电途', 'MA6DFCTD5', 'MA25CNM38', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'https://test.evshine.net/icnin/evcs/v1.1/', NULL, '000000'), + (NULL, 'MA6DFCTD5', 'MA25CNM38', 'OUT', NULL, NULL, 'ojs67l46z3f7rhok', 'tet9swfkyojkhaos', '4t8jr80mrjjt2y7f', + '75ghv1ie1zzex31s', 1, 'https://test.evshine.net/icnin/evcs/v1.1/', NULL, '000000'), + ('小桔', 'MA6DFCTD5', '101437000', 'IN', NULL, NULL, '8LpncubmWiPCzY3V', 'av6A8QdnRaVRMXu6', 'Ut5UFdqDthiJyncU', + 'wAeYIVQUwd0iGZsV', 1, 'http://opendev.xiaojukeji.com/operatorplatform/', NULL, '000000'), + (NULL, 'MA6DFCTD5', '101437000', 'OUT', NULL, NULL, '618c8e506e798acf', 'ea0e7e1b8fb8a935', '7751a50aa41683f0', + '7b3b03fe94654e3b', 1, 'http://opendev.xiaojukeji.com/operatorplatform/', NULL, '000000'); From 16d4cc0d7d3d5a2427b38c74fc5d270d5ba6c275 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 16:23:41 +0800 Subject: [PATCH 28/55] missing field value --- .../evcs/notification/NotificationChargeOrderInfo4BonusTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 11a24054..83ea240a 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -133,6 +133,7 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { EtOrderMapping etOrderMapping; EtOrderMapping om = new EtOrderMapping(); if (internetSerialNumber != null) { + om.setXhOrderNo(xhOrderNo); om.setEvcsOrderNo(internetSerialNumber); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); From 36f7c05d2303e3f55788228381aeccec74914ce1 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 16:28:40 +0800 Subject: [PATCH 29/55] save order mapping for real --- .../notification/NotificationChargeOrderInfo4BonusTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 83ea240a..3d94ccfc 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -133,11 +133,11 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { EtOrderMapping etOrderMapping; EtOrderMapping om = new EtOrderMapping(); if (internetSerialNumber != null) { - om.setXhOrderNo(xhOrderNo); om.setEvcsOrderNo(internetSerialNumber); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); if (etOrderMapping == null) { + om.setXhOrderNo(xhOrderNo); etOrderMapping = orderMappingRepository.save(om); } } else { From 815da83f4e8932c87d22083bf72ca11aac9cf92b Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 16:35:13 +0800 Subject: [PATCH 30/55] fix dup error --- .../notification/NotificationChargeOrderInfo4BonusTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 3d94ccfc..d056ea59 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -131,8 +131,9 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { OrderMappingRepository orderMappingRepository, String operatorId) { EtOrderMapping etOrderMapping; - EtOrderMapping om = new EtOrderMapping(); + EtOrderMapping om; if (internetSerialNumber != null) { + om = new EtOrderMapping(); om.setEvcsOrderNo(internetSerialNumber); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); @@ -141,6 +142,7 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { etOrderMapping = orderMappingRepository.save(om); } } else { + om = new EtOrderMapping(); om.setXhOrderNo(xhOrderNo); Example example = Example.of(om); etOrderMapping = orderMappingRepository.findOne(example).orElse(null); From c0981a99896a4fe8c244f1995c053b7bdcf328b0 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 13 Jan 2022 17:55:41 +0800 Subject: [PATCH 31/55] vin hex to char --- .../main/java/com/xhpc/pp/utils/HexUtils.java | 26 +++++++++++++------ .../com/xhpc/pp/logic/OrderDataLogic.java | 1 + .../pp/utils/security/CacheDataUtils.java | 2 ++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java index 7960ba98..ded4f96c 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java @@ -170,29 +170,39 @@ public class HexUtils { byte[] bytes = toBytes(hex); final StringBuilder result = new StringBuilder(); - for (byte b: bytes) { - for (int i=0; i<8; i++) { - result. append((int)(b >> (8-(i+1)) & 0x0001)); + for (byte b : bytes) { + for (int i = 0; i < 8; i++) { + result.append(b >> (8 - (i + 1)) & 0x0001); } } - return result. toString(); + return result.toString(); + } + + public static final String toAscii(String hex) { + + if (hex == null) return null; + byte[] bytes = toBytes(hex); + StringBuilder sb = new StringBuilder(); + for (byte b : bytes) { + sb.append(Character.valueOf((char) b)); + } + return sb.toString(); } public static void main(String[] args) { - System.out.println(Long.valueOf(10L).toString()); +// System.out.println(Long.valueOf(10L).toString()); // System.out.println(reverseHexInt("FF00")); // byte[] data1 = toBytes(reverseHex("10270000")); // System.out.println(toInteger(data1, 0, 4)); - System.out.println(reverseHexInt("D80E")); - System.out.println(toHexInt(3800)); +// System.out.println(reverseHexInt("D80E")); +// System.out.println(toHexInt(3800)); // System.out.println(toHexInt(100000)); // System.out.println(toBits("1000")); // System.out.println(toHex(new byte[]{104, 13, 19, 123, 0, 3, 105, -123, 71, -123, -106, 50, 84, 1, 0, 72, 106, 104, // -94, 19, 124, 0, 59, 105, -123, 71, -123, -106, 50, 84, 1, 33, 9, 24, 9, 67, 57, 0, 2, 105, -123, 71, -123, -106, // 50, 84, 1, -88, 97, 43, 9, 50, 9, 21, 48, 117, 50, 9, 50, 9, 21, -64, 87, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // -40, 83, 1, 0})); - } } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index b39a30b0..211316da 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -30,6 +30,7 @@ import static com.xhpc.pp.utils.security.CacheDataUtils.reflectTranslate; public class OrderDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(OrderDataLogic.class); + @Autowired private PileOrderService pileOrderService; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java index 97b5e6b9..779ab9f1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java @@ -40,6 +40,8 @@ public class CacheDataUtils { } } else if (tarFieldName.contains("ime")) { tarval = DateUtil.format(cp56toDate(srcval), NORM_DATETIME_FORMAT); + } else if (tarFieldName.startsWith("vin")) { + tarval = HexUtils.toAscii(srcval); } else { tarval = srcval; } From 690627c017732b2db3c8d6d019160f813660ad1d Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:03:24 +0800 Subject: [PATCH 32/55] =?UTF-8?q?=E4=BC=98=E5=8C=96invoice=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E8=BF=94=E5=9B=9E=E7=BB=99=E5=89=8D=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=AF=AD=E5=8F=A5=20=E7=BB=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BC=80=E5=8F=91=E7=A5=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=8E=E5=8F=B0=E7=94=9F=E6=88=90=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5404=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E8=AE=A9=E5=85=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?null=E5=80=BC=20=E4=BF=AE=E6=94=B9bootrap.yml=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E8=B7=AF=E5=BE=84=EF=BC=8C=E8=AE=A9=E5=85=B6=E4=B8=BA?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=EF=BC=8C=E5=90=88=E5=B9=B6=E6=98=AF=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/system/api/model/LoginUser.java | 2 +- .../com/xhpc/common/api/UserTypeService.java | 4 +- .../{invoice => }/XhpcInvoiceApplication.java | 2 +- .../controller/XhpcInvoiceController.java | 2 +- .../service/impl/XhpcInvoiceServiceImpl.java | 60 +++++++++++-------- .../src/main/resources/bootstrap.yml | 3 +- .../XhpcInvoiceMapHistoryOrderMapper.xml | 1 + 7 files changed, 43 insertions(+), 31 deletions(-) rename xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/{invoice => }/XhpcInvoiceApplication.java (98%) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java index cae15e70..49878ee4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java @@ -25,7 +25,7 @@ public class LoginUser implements Serializable private Long userid; /** - * 用户名 + * 用户账号（手机号、账号） */ private String username; diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java index 4508fe61..48058043 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; +import java.util.Map; /** * @author yuyang @@ -18,11 +19,12 @@ public interface UserTypeService { /** * 根据手机号（账号），用户id和类型 获取用户信息 + * * @param * @return */ @GetMapping("/common/getUser") - R getUser(@RequestParam(value = "phone")String phone,@RequestParam(value = "userId")Long userId,@RequestParam(value = "userType")Integer userType,@RequestParam(value = "serialNumber")String serialNumber,@RequestParam(value = "tenantId")String tenantId); + R> getUser(@RequestParam(value = "phone") String phone, @RequestParam(value = "userId") Long userId, @RequestParam(value = "userType") Integer userType, @RequestParam(value = "serialNumber") String serialNumber, @RequestParam(value = "tenantId") String tenantId); diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java rename to xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java index 51a0ad3d..f88706bd 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice; +package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index efd09327..ed1b7f29 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -95,7 +95,7 @@ public class XhpcInvoiceController extends BaseController { public AjaxResult invoiceToUser(@RequestBody InvoiceToUserRequest requestData) { //前置条件 if (requestData.getInvoiceId() == null) { - return AjaxResult.error("必须传递未开发票id"); + return AjaxResult.error("必须上传发票id"); } if (requestData.getStatus() == null || requestData.getStatus().equals(InvoiceStatusConst.INVOICING)) { return AjaxResult.error("必须传递发票状态或发票状态不能为0"); diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index e2d32a27..2528d3e7 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -128,6 +128,8 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public Boolean invoiceToUser(InvoiceToUserRequest requestData) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); @@ -137,7 +139,14 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //从阿里云上下载下来电子发票 String fileUrl = requestData.getEletricInvoiceUrl(); File electricInvoiceFile = new File(environment.getProperty("file.serverStoreDisposableFileLocation") + "ElectricInvoice.pdf"); - HttpUtil.downloadFile(fileUrl, electricInvoiceFile); + try { + //参数1 文件下载路径 + //参数2 文件存放位置 + //服务器响应404 表示服务器找不到客户端所请求的资源 + HttpUtil.downloadFile(fileUrl, electricInvoiceFile); + } catch (Exception e) { + throw new RuntimeException("在阿里云上无法找到该文件，请检查上传的图片路径是否完整或有误"); + } try { MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); } catch (Exception e) { @@ -161,6 +170,8 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public void failInvoiceToUser(InvoiceToUserRequest requestData) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); @@ -196,6 +207,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { public InvoiceTitleResponse findTitleInfo(String firmName) { List xhpcInvoiceList = xhpcInvoiceMapper.selectInvoiceTitleInfo(firmName); + InvoiceTitleResponse invoiceTitleResponse = new InvoiceTitleResponse(); + //如果没有记录，则返回空包装类 + if (xhpcInvoiceList.size() == 0) { + return invoiceTitleResponse; + } ArrayList dataDTOList = new ArrayList<>(); for (XhpcInvoice xhpcInvoice : xhpcInvoiceList) { InvoiceTitleResponse.DataDTO dataDTO = new InvoiceTitleResponse.DataDTO(); @@ -203,7 +219,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { dataDTO.setDutyNumber(xhpcInvoice.getDutyNumber()); dataDTOList.add(dataDTO); } - InvoiceTitleResponse invoiceTitleResponse = new InvoiceTitleResponse(); invoiceTitleResponse.setData(dataDTOList); return invoiceTitleResponse; } @@ -223,6 +238,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectUserLastInputInvoiceInfo(creatorId, creatorType); TitleResponse titleResponse = new TitleResponse(); + //如果数据库本身就没有数据，那么就返回空实体类对象 + if (xhpcInvoice == null) { + return titleResponse; + } BeanUtils.copyProperties(xhpcInvoice, titleResponse); return titleResponse; @@ -251,6 +270,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //查询该用户3个月内可以开发票的历史订单 List> xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList); InvoicedOrderResponse invoicedOrderResponse = new InvoicedOrderResponse(); + //没有则直接返回空对象出去 + if (xhpcHistoryOrderList.size() == 0) { + return invoicedOrderResponse; + } //设置该用户3个月内可以开发票的历史订单数量 invoicedOrderResponse.setTotalItems(xhpcHistoryOrderList.size()); //查询该用户所有可以开的发票的历史订单数量 @@ -312,29 +335,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { invoicedOrderResponse.setItems(itemsDTOS); return invoicedOrderResponse; -// //计算分页索引,放置到currentPage属性中 -// int startIndex = (invoicedOrdersRequest.getCurrentPage() - 1) * invoicedOrdersRequest.getItems(); -// invoicedOrdersRequest.setCurrentPage(startIndex); -// //先查询该用户被锁定了的订单，过滤掉它 -// List lockOrderNumberList = xhpcInvoiceMapHistoryOrderMapper.findLockOrdersByUserIdAndUserType(invoicedOrdersRequest); -// //查询该用户3个月内可以开发票的历史订单 -// List xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList); -// ArrayList itemsDTOList = new ArrayList<>(); -// for (XhpcHistoryOrder xhpcHistoryOrder : xhpcHistoryOrderList) { -// InvoiceOrdersResponse.ItemsDTO itemsDTO = new InvoiceOrdersResponse.ItemsDTO(); -// itemsDTO.setOrderId(xhpcHistoryOrder.getHistoryOrderId()); -// itemsDTO.setOrderNumber(xhpcHistoryOrder.getSerialNumber()); -// itemsDTO.setOrderMoney(xhpcHistoryOrder.getActPrice()); -// itemsDTO.setOrderTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, xhpcHistoryOrder.getCreateTime())); -// itemsDTOList.add(itemsDTO); -// } -// InvoiceOrdersResponse invoiceOrdersResponse = new InvoiceOrdersResponse(); -// invoiceOrdersResponse.setItems(itemsDTOList); -// //查询该用户所有可以开发票的历史订单的数量 -// Long allOrdersCount = xhpcHistoryOrderMapper.findAllOrdersByCondition(invoicedOrdersRequest, lockOrderNumberList); -// invoiceOrdersResponse.setTotalItems(allOrdersCount); -// return invoiceOrdersResponse; - } /** @@ -353,6 +353,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //对拷发票部分数据 XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectByPrimaryKey(invoiceId); SpecificInvoicedResponse specificInvoicedResponse = new SpecificInvoicedResponse(); + //查不出来返回空包装类 + if (xhpcInvoice == null) { + return specificInvoicedResponse; + } specificInvoicedResponse.setCreatorTime(DateUtils.parseDateToStr(xhpcInvoice.getCreateTime())); specificInvoicedResponse.setReceiveEmail(xhpcInvoice.getReceiveEmail()); specificInvoicedResponse.setTitleType(xhpcInvoice.getTitleType()); @@ -462,6 +466,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { invoiceHistoryRecordsRequest.setCurrentPage(startIndex); //获取该用户所提交的每个发票信息 List invoicesList = xhpcInvoiceMapper.findInvoicesByCreatorIdAndCreatorType(invoiceHistoryRecordsRequest); + //如果为0，那么则返回空的实体类出去 + InvoiceHistoryRecordsResponse invoiceHistoryRecordsResponse = new InvoiceHistoryRecordsResponse(); + if (invoicesList.size() == 0) { + return invoiceHistoryRecordsResponse; + } //实体类对拷 ArrayList itemsDTOS = new ArrayList<>(); for (XhpcInvoice xhpcInvoice : invoicesList) { @@ -473,7 +482,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { itemsDTO.setIsRead(xhpcInvoice.getIsRead()); itemsDTOS.add(itemsDTO); } - InvoiceHistoryRecordsResponse invoiceHistoryRecordsResponse = new InvoiceHistoryRecordsResponse(); invoiceHistoryRecordsResponse.setItems(itemsDTOS); Long userInvoiceItems = xhpcInvoiceMapper.getUserInvoiceItemsByCreatorIdAndCreatorType(invoiceHistoryRecordsRequest.getCreatorId(), invoiceHistoryRecordsRequest.getCreatorType()); invoiceHistoryRecordsResponse.setTotalItems(userInvoiceItems); diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml index 9f962452..adcb25c9 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml @@ -37,4 +37,5 @@ oss: #文件路径 file: aliyunPath: invoicePdf/ - serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ \ No newline at end of file + # serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ + serverStoreDisposableFileLocation: C:\\www\\wwwroot\\xhpc.scxhua.com\\disposableFiles\\ \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml index 08622bd6..783c6d8d 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml @@ -1,5 +1,6 @@ + From 6919cff922ea336b356d092bf16268406baf269f Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 13 Jan 2022 18:05:37 +0800 Subject: [PATCH 33/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/mapper/XhpcHistoryOrderMapper.java | 6 + .../service/IXhpcRealTimeOrderService.java | 5 + .../impl/XhpcHistoryOrderServiceImpl.java | 129 +++++++++++++++++- .../impl/XhpcRealTimeOrderServiceImpl.java | 5 + .../mapper/XhpcHistoryOrderMapper.xml | 45 ++++++ .../mapper/XhpcUserAccountStatementMapper.xml | 4 +- 6 files changed, 187 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java index 6c7f51af..334dff6b 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java @@ -112,4 +112,10 @@ public interface XhpcHistoryOrderMapper { * 获取登陆用户信息 */ Map getLandUser(@Param("userId")Long userId); + + + /** + * 查询启动订单表 + */ + Map getchargingOrderById(@Param("chargingOrderId")Long chargingOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java index b5137124..1bddceb4 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java @@ -138,4 +138,9 @@ public interface IXhpcRealTimeOrderService { */ Map addOrderTime(CacheRealtimeData cacheRealtimeData, XhpcChargeOrder xhpcChargeOrder, String orderNo, Integer type); + + /** + * 获取一条实时数据 + */ + XhpcRealTimeOrder getChargingOrderId(Long chargingOrderId,Integer type); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index d49637f9..e32078a3 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.xhpc.common.util.EvcsUtil; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.order.domain.XhpcChargeOrder; import com.xhpc.order.domain.XhpcHistoryOrder; +import com.xhpc.order.domain.XhpcRealTimeOrder; import com.xhpc.order.dto.XhpcChargeHistoryOrder; import com.xhpc.order.mapper.XhpcHistoryOrderMapper; import com.xhpc.order.mapper.XhpcRealTimeOrderMapper; @@ -104,7 +105,95 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis @Override public AjaxResult gethistotyOrderMessage(HttpServletRequest request, Long userId, Long historyOrderId, Integer type, Long chargingOrderId) { LoginUser loginUser = tokenService.getLoginUser(request); - return AjaxResult.success(xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, type, chargingOrderId,loginUser.getTenantId())); + + Map map = xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, type, chargingOrderId, loginUser.getTenantId()); + if(map !=null){ + return AjaxResult.success(map); + } + //查询最后一帧数据 + if(chargingOrderId !=null){ + Map stringObjectMap = xhpcHistoryOrderMapper.getchargingOrderById(chargingOrderId); + if(stringObjectMap !=null){ + //获取该订单最后一条实时数据 + Map cacheMap = redisService.getCacheMap("order:" + stringObjectMap.get("serialNumber").toString()); + List list = (List) cacheMap.get("realtimeDataList"); + CacheRealtimeData startData =new CacheRealtimeData(); + CacheRealtimeData endData =new CacheRealtimeData(); + + Date startTime = null; + Date endTime = null; + BigDecimal amountCharged = new BigDecimal(0); + //充电度数 + BigDecimal chargingDegree = new BigDecimal(0); + if (list != null && list.size() > 0) { + endData =list.get(list.size()-1); + for (int i = 0; i 0){ + break; + } + } + } + Long rateModelId = Long.valueOf(stringObjectMap.get("rateModelId").toString()); + if(endData !=null && endData.getAmountCharged() !=null){ + //最后一祯时间 + endTime = DateUtil.parse(endData.getCreateTime()); + startTime =DateUtil.parse(startData.getCreateTime()); + //充电时长 + Long tiem = (endTime.getTime() - startTime.getTime()) / 1000; + if (tiem > 3600) { + long hours = tiem / 3600; + double mins = (double) ((tiem - (hours * 3600)) / 60); + stringObjectMap.put("chargingTime",hours + "时" + new BigDecimal(mins).setScale(0) + "分"); + } else { + double mins = (double) (tiem / 60); + stringObjectMap.put("chargingTime",new BigDecimal(mins).setScale(0) + "分"); + } + chargingDegree = new BigDecimal(endData.getChargingDegree()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN); + stringObjectMap.put("chargingDegree",chargingDegree); + amountCharged = new BigDecimal(endData.getAmountCharged()).divide(new BigDecimal(10000),2,BigDecimal.ROUND_DOWN); + stringObjectMap.put("actPrice",amountCharged); + }else{ + //当没有缓存数据时，查询数据库 + XhpcRealTimeOrder startRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(chargingOrderId, 1); + XhpcRealTimeOrder endRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(chargingOrderId, 2); + if(startRealTimeOrder==null || endRealTimeOrder==null){ + return AjaxResult.success(); + } + //最后一祯时间 + endTime = endRealTimeOrder.getCreateTime(); + startTime = startRealTimeOrder.getCreateTime(); + chargingDegree = endRealTimeOrder.getChargingDegree(); + stringObjectMap.put("chargingDegree",chargingDegree); + stringObjectMap.put("chargingTime",endRealTimeOrder.getChargingTime()); + amountCharged=endRealTimeOrder.getAmountCharged(); + stringObjectMap.put("actPrice",amountCharged); + } + BigDecimal powerPriceTotal =new BigDecimal(0); + //1时间没有跨天 + DateTime parse = DateUtil.parse(DateUtil.format(startTime, "yyyy-MM-dd"), "yyyy-MM-dd"); + DateTime parse1 = DateUtil.parse(DateUtil.format(endTime, "yyyy-MM-dd"), "yyyy-MM-dd"); + //每分钟多少度电 + BigDecimal decimal = new BigDecimal((endTime.getTime() - startTime.getTime())).divide(new BigDecimal(60000),4,BigDecimal.ROUND_DOWN); + BigDecimal divide = chargingDegree.divide(decimal,4,BigDecimal.ROUND_DOWN); + long betweenDay = DateUtil.between(parse,parse1, DateUnit.DAY); + if(betweenDay==0){ + powerPriceTotal = getBigDecimal(rateModelId,DateUtil.formatTime(startTime), DateUtil.formatTime(endTime), powerPriceTotal, divide); + }else{ + //跨天 + powerPriceTotal = getBigDecimal(rateModelId, DateUtil.formatTime(startTime), "23:59:59", powerPriceTotal, divide); + System.out.println(">>>>>>跨天前>>>>>>>"+powerPriceTotal); + //明天 + DateTime tomorrow = DateUtil.offsetDay(startTime,1); + Date startTime3 = DateUtil.beginOfDay(tomorrow); + powerPriceTotal = getBigDecimal(rateModelId, DateUtil.formatTime(startTime3), DateUtil.formatTime(endTime), powerPriceTotal, divide); + System.out.println(">>>>>>跨天后>>>>>>>"+powerPriceTotal); + } + stringObjectMap.put("actPowerPrice",powerPriceTotal); + } + return AjaxResult.success(stringObjectMap); + } + return AjaxResult.success(); } @Override @@ -803,11 +892,41 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis return powerPriceTotal; } - private BigDecimal getRateTimeList(String startTime, String endTime, BigDecimal degree, BigDecimal powerPrice) { - BigDecimal v = new BigDecimal((DateUtil.parse(endTime).getTime() - DateUtil.parse(startTime).getTime()) / 60000).multiply(degree); - BigDecimal multiply = powerPrice.multiply(v).setScale(2, BigDecimal.ROUND_DOWN); - return multiply; + private BigDecimal getBigDecimal(Long rateModelId, String startTime, String updateTime, BigDecimal powerPriceTotal, BigDecimal divide) { + List> reatTimeList = getReatTimeList(startTime,updateTime, rateModelId); + for (int i = 0; i map = reatTimeList.get(i); + String startTime1 = map.get("startTime").toString(); + String endTime1 = map.get("endTime").toString(); + BigDecimal powerFee =new BigDecimal(map.get("powerFee").toString()); + if("00:00:00".equals(endTime1)){ + endTime1="23:59:59"; + } + //获取费率 + if(size==1){ + powerPriceTotal = powerPriceTotal.add(getRateTimeList(startTime,updateTime,divide,powerFee)); + }else{ + if(i==0){ + powerPriceTotal = powerPriceTotal.add(getRateTimeList(startTime,endTime1,divide,powerFee)); + } else if(i> reatTimeList = xhpcHistoryOrderService.getReatTimeList(startTime,updateTime, rateModelId); for (int i = 0; i select user_id as userId,user_type as userType,operator_id as operatorId from sys_user where user_id =#{userId} + + diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index 4c20481c..9a6cdc92 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -139,10 +139,10 @@ and xau.app_user_id = #{appUserId} - and xau.tenant_id = #{tenantId} + and xuas.tenant_id = #{tenantId} - and xau.source = #{source} + and xuas.source = #{source} ORDER BY xuas.create_time DESC From df97402324945f426d068702d3050e13af6c0143 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:09:53 +0800 Subject: [PATCH 34/55] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BB=99=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=8F=91=E9=80=81=E8=81=8A=E5=A4=A9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E5=8F=B0=E6=89=80=E5=8F=91=E9=80=81=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=E5=A4=A7?= =?UTF-8?q?=E8=87=B4=E5=AE=8C=E6=88=90=E5=B9=B3=E5=8F=B0=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=99=E7=94=A8=E6=88=B7=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C=E6=89=93=E5=8D=B0Mybatis?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcMessageBoardApplication.java | 2 +- .../api/XhpcMessageBoardApiController.java | 22 +- .../XhpcMessageBoardController.java | 35 +++ .../board/domain/PlatformQueryCondition.java | 29 ++ .../PlatformSendMessageToUserRequest.java | 31 ++ .../domain/QueryUserMassageResponse.java | 48 +++ .../domain/SendMessageToPlatformRequest.java | 12 +- .../xhpc/board/domain/UserQueryCondition.java | 29 ++ .../board/mapper/XhpcMessageBoardMapper.java | 97 ++++++ .../XhpcMessageBoardReceiveUserMapper.java | 40 +++ .../com/xhpc/board/pojo/XhpcMessageBoard.java | 68 ++++ .../pojo/XhpcMessageBoardReceiveUser.java | 52 ++++ .../service/XhpcMessageBoardService.java | 39 ++- .../impl/XhpcMessageBoardServiceImpl.java | 225 +++++++++++++- .../src/main/resources/bootstrap.yml | 5 +- .../mapper/XhpcMessageBoardMapper.xml | 292 ++++++++++++++++++ .../XhpcMessageBoardReceiveUserMapper.xml | 102 ++++++ 17 files changed, 1112 insertions(+), 16 deletions(-) rename xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/{board => }/XhpcMessageBoardApplication.java (98%) create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java similarity index 98% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java rename to xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java index 27a76f51..36f0e453 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java @@ -1,4 +1,4 @@ -package com.xhpc.board; +package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java index eed7651e..5ff82e64 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -1,13 +1,14 @@ package com.xhpc.board.api; +import com.xhpc.board.domain.QueryUserMassageResponse; import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; import com.xhpc.board.service.XhpcMessageBoardService; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -19,7 +20,7 @@ import javax.annotation.Resource; * @since version-1.0 */ @RestController -@RequestMapping("/api/message-board/") +@RequestMapping("/api/message-board") public class XhpcMessageBoardApiController extends BaseController { @Resource @@ -33,9 +34,18 @@ public class XhpcMessageBoardApiController extends BaseController { * @since version-1.0 */ @PostMapping("/user/message") + @Log(title = "留言板-用户发送聊天信息", businessType = BusinessType.INSERT) public AjaxResult sendMessageToPlatform(@RequestBody SendMessageToPlatformRequest userMessage) { + xhpcMessageBoardService.writeUserMessageToDb(userMessage); return AjaxResult.success(); } -} + @GetMapping("/user/message") + public AjaxResult queryUserMessage(UserQueryCondition userQueryCondition) { + + QueryUserMassageResponse queryUserMassageResponse = xhpcMessageBoardService.queryUserMessage(userQueryCondition); + return AjaxResult.success(queryUserMassageResponse); + } + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java new file mode 100644 index 00000000..24c2b409 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -0,0 +1,35 @@ +package com.xhpc.board.controller; + +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.core.web.domain.AjaxResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 留言板服务Controller + * + * @author WH + * @date 2022/1/10 10:02 + * @since version-1.0 + */ +@RestController +@RequestMapping("/board") +public class XhpcMessageBoardController { + + @Resource + XhpcMessageBoardService xhpcMessageBoardService; + + @PostMapping("/platform/message") + public AjaxResult platformSendMessageToUser(@RequestBody PlatformSendMessageToUserRequest platformRequest) { + + xhpcMessageBoardService.platformSendMessageToUser(platformRequest); + + return AjaxResult.success(); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java new file mode 100644 index 00000000..2d36a24c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java @@ -0,0 +1,29 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 平台查询条件 + * + * @author WH + * @date 2022/1/12 15:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class PlatformQueryCondition { + + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java new file mode 100644 index 00000000..943e408a --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java @@ -0,0 +1,31 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 平台向用户发送的信息包装类 + * + * @author WH + * @date 2022/1/11 13:47 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class PlatformSendMessageToUserRequest { + + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("messageContent") + private String messageContent; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java new file mode 100644 index 00000000..7bf9fb9e --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java @@ -0,0 +1,48 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 查询用户信息的返回封装数据类 + * + * @author WH + * @date 2022/1/13 10:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class QueryUserMassageResponse { + + @JsonProperty("nextQueryTime") + private String nextQueryTime; + @JsonProperty("data") + private List data; + + @NoArgsConstructor + @Data + public static class DataDTO { + + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("messageContent") + private String messageContent; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("have_new_info") + private Integer haveNewInfo; + @JsonProperty("sender") + private Integer sender; + + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java index 1a7a2aa4..6b950fa3 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java @@ -21,11 +21,11 @@ public class SendMessageToPlatformRequest { private String senderAccount; @JsonProperty("senderType") private Integer senderType; - @JsonProperty("senderContent") - private String senderContent; - @JsonProperty("receiveId") - private String receiveId; - @JsonProperty("receiverType") - private Integer receiverType; + @JsonProperty("messageContent") + private String messageContent; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java new file mode 100644 index 00000000..cc8a35b3 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java @@ -0,0 +1,29 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 用户查询条件 + * + * @author WH + * @date 2022/1/12 15:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class UserQueryCondition { + + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java new file mode 100644 index 00000000..2bd03c28 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java @@ -0,0 +1,97 @@ +package com.xhpc.board.mapper; + +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.pojo.XhpcMessageBoard; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface XhpcMessageBoardMapper { + + int deleteByPrimaryKey(Long messageId); + + int insert(XhpcMessageBoard record); + + int insertSelective(XhpcMessageBoard record); + + XhpcMessageBoard selectByPrimaryKey(Long messageId); + + int updateByPrimaryKeySelective(XhpcMessageBoard record); + + int updateByPrimaryKey(XhpcMessageBoard record); + + /** + * 用户端存入时间记录 + * + * @param userMessage 用户时间记录信息 + * @author WH + * @date 2022/1/11 17:46 + * @since version-1.0 + */ + void insertUserTimeMessageRecord(SendMessageToPlatformRequest userMessage); + + /** + * 用户端存入发送的消息 + * + * @param userMessage 用户发送的消息 + * @author WH + * @date 2022/1/11 18:16 + * @since version-1.0 + */ + void insertUserMessage(SendMessageToPlatformRequest userMessage); + + /** + * 平台端存入发送的信息 + * + * @param platformRequest 平台所要发送给用户的信息 + * @author WH + * @date 2022/1/12 11:30 + * @since version-1.0 + */ + void insertPlatformMessage(PlatformSendMessageToUserRequest platformRequest); + + /** + * 平台端存入时间记录 + * + * @param platformRequest 平台时间记录信息 + * @author WH + * @date 2022/1/12 11:49 + * @since version-1.0 + */ + void insertPlatformTimeMessageRecord(PlatformSendMessageToUserRequest platformRequest); + + /** + * 查询用户一个月的记录 + * + * @param userQueryCondition 用户查询条件 + * @param nextTimeStr 上一个月的时间 + * @return 返回一个装有一个月的数据的集合 + * @author WH + * @date 2022/1/12 16:03 + * @since version-1.0 + */ + List selectBy(@Param("userQueryCondition") UserQueryCondition userQueryCondition, @Param("nextTimeStr") String nextTimeStr); + + /** + * 给查询出来的记录，添加用户已读状态 + * + * @param messageIdList 查询出来的记录的id集合 + * @author WH + * @date 2022/1/13 10:16 + * @since version-1.0 + */ + void setUserReadedStatus(List messageIdList); + + /** + * 查询用户所有时间记录 + * + * @param userQueryCondition 用户信息 + * @author WH + * @date 2022/1/13 10:56 + * @since version-1.0 + */ + List selectTimeRecords(UserQueryCondition userQueryCondition); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java new file mode 100644 index 00000000..54ae11b7 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java @@ -0,0 +1,40 @@ +package com.xhpc.board.mapper; + +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; + +/** + * the mapper of the xhpc_message_board_receive_user + * + * @author WH + * @date 2022/1/11 10:26 + * @since version-1.0 + */ +public interface XhpcMessageBoardReceiveUserMapper { + + int insert(XhpcMessageBoardReceiveUser record); + + int insertSelective(XhpcMessageBoardReceiveUser record); + + /** + * 通过用户id，用户类型，租户id，租户类型，查询指定记录 + * + * @param userMessage 储存条件的包装类 + * @return 指定记录 + * @author WH + * @date 2022/1/10 18:03 + * @since version-1.0 + */ + XhpcMessageBoardReceiveUser findOneByCondition(SendMessageToPlatformRequest userMessage); + + /** + * 将指定用户记录have_new_info字段的值，将其设置为0，即该用户发送了新消息 + * + * @param userMessage 指定要更新哪个记录的条件 + * @author WH + * @date 2022/1/11 10:31 + * @since version-1.0 + */ + void updateHaveNewInfoFiledByUserCondition(SendMessageToPlatformRequest userMessage); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java new file mode 100644 index 00000000..2c41e605 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java @@ -0,0 +1,68 @@ +package com.xhpc.board.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * xhpc_message_board + * + * @author WH + */ +@Data +public class XhpcMessageBoard implements Serializable { + + /** + * 消息id + */ + private Long messageId; + + /** + * 用户类型 + */ + private Integer senderType; + + /** + * 用户账号 + */ + private String senderAccount; + + /** + * 发送消息的时间 + */ + private Date sendMessageTime; + + /** + * 消息内容 + */ + private String messageContent; + + /** + * 租户类型 + */ + private Integer tenantType; + + /** + * 租户id（平台id） + */ + private String tenantId; + + /** + * 租户发送的消息，用户是否已读，默认为null，表示未读，0表示已读 + */ + private Integer haveNewInfo; + + /** + * 逻辑删除字段 + */ + private Integer delFlag; + + /** + * 发送者（0，用户，1，时间，2，平台（租户）） + */ + private Integer sender; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java new file mode 100644 index 00000000..f71d6430 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java @@ -0,0 +1,52 @@ +package com.xhpc.board.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * xhpc_message_board_receive_user + * + * @author WH + */ +@Data +public class XhpcMessageBoardReceiveUser implements Serializable { + + /** + * 接收者id（租户id） + */ + private String tenantId; + + /** + * 接收者类型（租户类型） + */ + private Integer tenantType; + + /** + * 发送者账号 + */ + private String senderAccount; + + /** + * 发送者类型（0 C端用户 1 流量方用户 2社区用户 3B端用户） + */ + private Integer senderType; + + /** + * 用户头像地址 + */ + private String userIcon; + + /** + * 是否有新消息（null表示有新消息，0表示没有） + */ + private Integer haveNewInfo; + + /** + * 逻辑删除（0为删除） + */ + private Integer delFlag; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index cae8b8ce..d03e5152 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -1,5 +1,10 @@ package com.xhpc.board.service; +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.QueryUserMassageResponse; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; + /** * 留言板服务的Service * @@ -7,6 +12,38 @@ package com.xhpc.board.service; * @date 2022/1/7 17:57 * @since version-1.0 */ -public class XhpcMessageBoardService { +public interface XhpcMessageBoardService { + + /** + * 将用户发送的信息保存到数据库中 + * + * @param userMessage 用户发送的信息 + * @author WH + * @date 2022/1/10 14:17 + * @since version-1.0 + */ + void writeUserMessageToDb(SendMessageToPlatformRequest userMessage); + + /** + * 将平台（租户）发送的信息保存到数据库中 + * + * @param platformRequest 平台消息 + * @author WH + * @date 2022/1/11 13:58 + * @since version-1.0 + */ + void platformSendMessageToUser(PlatformSendMessageToUserRequest platformRequest); + + /** + * 根据用户条件，查询指定的数据库中的记录 + * + * @param userQueryCondition 用户传入的条件 + * @return 用户在数据库中发送的记录 + * @author WH + * @date 2022/1/12 15:30 + * @since version-1.0 + */ + QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition); + } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 9fee818f..57d1f8c0 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -1,5 +1,228 @@ package com.xhpc.board.service.impl; -public class XhpcMessageBoardServiceImpl { +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.QueryUserMassageResponse; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.mapper.XhpcMessageBoardMapper; +import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper; +import com.xhpc.board.pojo.XhpcMessageBoard; +import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.domain.R; +import com.xhpc.common.core.utils.DateUtils; +import com.xhpc.common.core.utils.bean.BeanUtils; +import com.xhpc.common.redis.service.RedisService; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.DateUtil; +import com.xhpc.system.api.domain.SysUser; +import com.xhpc.system.api.model.LoginUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 留言板实现类 + * + * @author WH + */ +@Service +public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { + + @Resource + TokenService tokenService; + @Resource + XhpcMessageBoardMapper messageBoardMapper; + @Resource + XhpcMessageBoardReceiveUserMapper xhpcMessageBoardReceiveUserMapper; + @Resource + RedisService redisService; + @Resource + UserTypeService userTypeService; + + + /** + * 将用户发送的信息保存到数据库中 + * + * @param userMessage 用户发送的信息 + * @author WH + * @date 2022/1/10 14:17 + * @since version-1.0 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void writeUserMessageToDb(SendMessageToPlatformRequest userMessage) { + //解析Token，获取用户与平台用户信息 + LoginUser loginUser = tokenService.getLoginUser(); + String userRedisKey = "userMessageValidTime:" + loginUser.getUserType() + ":" + loginUser.getUserid() + ":" + userMessage.getTenantType() + ":" + userMessage.getTenantId(); + //使用Redis判断消息发送是否大于5分钟： + Object cacheObject = redisService.getCacheObject(userRedisKey); + String currentTime; + if (cacheObject == null) { + //设置当前时间 + currentTime = DateUtil.getYyyyMmDdHhMmSs(); + redisService.setCacheObject(userRedisKey, currentTime); + redisService.expire(userRedisKey, 60 * 5); + //设置平台RedisKey的有效时间，保证双方时间数据同步 + String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); + redisService.setCacheObject(platformRedisKey, currentTime); + redisService.expire(platformRedisKey, 60 * 5); + userMessage.setSendMessageTime(currentTime); + userMessage.setSenderAccount(loginUser.getUsername()); + userMessage.setSenderType(loginUser.getUserType()); + messageBoardMapper.insertUserTimeMessageRecord(userMessage); + messageBoardMapper.insertUserMessage(userMessage); + XhpcMessageBoardReceiveUser receiverUser = xhpcMessageBoardReceiveUserMapper.findOneByCondition(userMessage); + if (receiverUser == null) { + XhpcMessageBoardReceiveUser xhpcMessageBoardReceiveUser = new XhpcMessageBoardReceiveUser(); + BeanUtils.copyProperties(userMessage, xhpcMessageBoardReceiveUser); + //发送请求所返回的响应信息 + R> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId()); + Map userInfo = result.getData(); + String avatar = (String) userInfo.get("avatar"); + xhpcMessageBoardReceiveUser.setUserIcon(avatar); + xhpcMessageBoardReceiveUser.setHaveNewInfo(0); + xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); + } else { + xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + } + } else { + //reset redis key valid time + redisService.expire(userRedisKey, 60 * 5); + currentTime = (String) cacheObject; + userMessage.setSendMessageTime(currentTime); + //设置用户账号，用户类型 + userMessage.setSenderAccount(loginUser.getUsername()); + userMessage.setSenderType(loginUser.getUserType()); + messageBoardMapper.insertUserMessage(userMessage); + //向租户显示的列表中添加该用户信息，表示该用户来新消息了，如果列表中已经有该用户了，则只更新状态即可。 + XhpcMessageBoardReceiveUser receiverUser = xhpcMessageBoardReceiveUserMapper.findOneByCondition(userMessage); + if (receiverUser == null) { + XhpcMessageBoardReceiveUser xhpcMessageBoardReceiveUser = new XhpcMessageBoardReceiveUser(); + BeanUtils.copyProperties(userMessage, xhpcMessageBoardReceiveUser); + //发送请求所返回的响应信息 + R> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId()); + Map userInfo = result.getData(); + String avatar = (String) userInfo.get("avatar"); + xhpcMessageBoardReceiveUser.setUserIcon(avatar); + xhpcMessageBoardReceiveUser.setHaveNewInfo(0); + xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); + } else { + xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + } + } + } + + /** + * 将平台（租户）发送的信息保存到数据库中 + * + * @param platformRequest 平台消息 + * @author WH + * @date 2022/1/11 13:58 + * @since version-1.0 + */ + @Override + public void platformSendMessageToUser(PlatformSendMessageToUserRequest platformRequest) { + + //获取平台用户信息 + SysUser sysUser = tokenService.getLoginUser().getSysUser(); + //使用redis控制发送时间 + String platformRedisKey = "PlatformMessageValidTime:" + "0:" + sysUser.getTenantId() + ":" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount(); + Object cacheObject = redisService.getCacheObject(platformRedisKey); + String currentTime; + if (cacheObject == null) { + //设置当前时间 + currentTime = DateUtil.getYyyyMmDdHhMmSs(); + redisService.setCacheObject(platformRedisKey, currentTime); + redisService.expire(platformRedisKey, 60 * 5); + //设置用户RedisKey的有效时间，保证双方时间数据同步 + String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); + redisService.setCacheObject(userRedisKey, currentTime); + redisService.expire(userRedisKey, 60 * 5); + platformRequest.setSendMessageTime(currentTime); + platformRequest.setTenantId(sysUser.getTenantId()); + platformRequest.setTenantType(0); + messageBoardMapper.insertPlatformTimeMessageRecord(platformRequest); + messageBoardMapper.insertPlatformMessage(platformRequest); + } + //reset redis key valid time + redisService.expire(platformRedisKey, 60 * 5); + platformRequest.setSendMessageTime((String) cacheObject); + platformRequest.setTenantId(sysUser.getTenantId()); + platformRequest.setTenantType(0); + messageBoardMapper.insertPlatformMessage(platformRequest); + } + + /** + * 根据用户条件，查询指定的数据库中的记录 + * + * @param userQueryCondition 用户传入的条件 + * @author WH + * @date 2022/1/12 15:30 + * @since version-1.0 + */ + @Override + public QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition) { + //完善条件集合 + LoginUser loginUser = tokenService.getLoginUser(); + userQueryCondition.setSenderAccount(loginUser.getUsername()); + userQueryCondition.setSenderType(loginUser.getUserType()); + String nextTimeStr = null; + if ("".equals(userQueryCondition.getSendMessageTime()) || userQueryCondition.getSendMessageTime() == null || "null".equals(userQueryCondition.getSendMessageTime())) { + userQueryCondition.setSendMessageTime(DateUtil.getYyyyMmDdHhMmSs()); + //查询用户是否有数据，即查询该用户的所有时间记录（有时间记录表示该用户发送过信息） + List allTimeRecords = messageBoardMapper.selectTimeRecords(userQueryCondition); + QueryUserMassageResponse queryUserMassageResponse = new QueryUserMassageResponse(); + if (allTimeRecords.size() == 0) { + return queryUserMassageResponse; + } + //获取最后一个时间记录，将其减去一个月，放入查询条件中 + XhpcMessageBoard xhpcMessageBoard = allTimeRecords.get(allTimeRecords.size() - 1); + Date finalTime = xhpcMessageBoard.getSendMessageTime(); + userQueryCondition.setSendMessageTime(DateUtils.parseDateToStr(finalTime)); + Calendar finalTimeCalendar = DateUtil.getCalendar(finalTime); + finalTimeCalendar.add(Calendar.MONTH, -1); + Date nextTime = finalTimeCalendar.getTime(); + nextTimeStr = DateUtils.parseDateToStr(nextTime); + } else { + //如果有值过来，说明有之前的记录，计算上一个月的值，作为查询条件，并返回 + String sendMessageTimeStr = userQueryCondition.getSendMessageTime(); + Date sendMessageTimeDate = DateUtils.parseDate(sendMessageTimeStr); + Calendar nextTimeCalendar = DateUtil.getCalendar(sendMessageTimeDate); + nextTimeCalendar.add(Calendar.MONTH, -1); + Date nextTime = nextTimeCalendar.getTime(); + nextTimeStr = DateUtils.parseDateToStr(nextTime); + } + //根据用户信息中所保存的时间，与上个月时间进行区间查询 + List aMonthRecords = messageBoardMapper.selectBy(userQueryCondition, nextTimeStr); + //如果没有数据，则返回空实体类对象 + QueryUserMassageResponse response = new QueryUserMassageResponse(); + if (aMonthRecords.size() == 0) { + return response; + } + List messageIdList = new ArrayList<>(); + for (int index = 0; index <= aMonthRecords.size() - 1; index++) { + Long messageId = aMonthRecords.get(index).getMessageId(); + messageIdList.add(messageId); + } + //设置查询出来的记录为已读状态 + messageBoardMapper.setUserReadedStatus(messageIdList); + //封装数据 + ArrayList dataDTOS = new ArrayList<>(); + for (XhpcMessageBoard aMonthRecord : aMonthRecords) { + QueryUserMassageResponse.DataDTO dataDTO = new QueryUserMassageResponse.DataDTO(); + BeanUtils.copyProperties(aMonthRecord, dataDTO); + dataDTO.setSendMessageTime(DateUtils.parseDateToStr(aMonthRecord.getSendMessageTime())); + dataDTOS.add(dataDTO); + } + //处理下次查询时间 + //todo 截取时间 + response.setNextQueryTime(nextTimeStr); + response.setData(dataDTOS); + return response; + } } diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml index b4365277..c0bbf680 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml @@ -22,4 +22,7 @@ spring: file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.xhpc.board.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml new file mode 100644 index 00000000..0f2c01bf --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + message_id + , sender_type, sender_account, send_message_time, message_content, tenant_type, + tenant_id, have_new_info, del_flag, sender + + + + + + delete + from xhpc_message_board + where message_id = #{messageId,jdbcType=BIGINT} + + + insert into xhpc_message_board (sender_type, sender_account, send_message_time, + message_content, tenant_type, tenant_id, + have_new_info, del_flag, sender) + values (#{senderType,jdbcType=TINYINT}, #{senderAccount,jdbcType=VARCHAR}, + #{sendMessageTime,jdbcType=TIMESTAMP}, + #{messageContent,jdbcType=VARCHAR}, #{tenantType,jdbcType=TINYINT}, #{tenantId,jdbcType=VARCHAR}, + #{haveNewInfo,jdbcType=BOOLEAN}, #{delFlag,jdbcType=BOOLEAN}, #{sender,jdbcType=BOOLEAN}) + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + + have_new_info, + + + del_flag, + + + sender, + + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + + #{haveNewInfo,jdbcType=BOOLEAN}, + + + #{delFlag,jdbcType=BOOLEAN}, + + + #{sender,jdbcType=BOOLEAN}, + + + + + insert into xhpc_message_board + (sender_type, sender_account, send_message_time, tenant_type, tenant_id, sender) + values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 1) + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + have_new_info, + sender, + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + 0, + 0, + + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + have_new_info, + sender, + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + 0, + 2, + + + + insert into xhpc_message_board + (sender_type, sender_account, send_message_time, tenant_type, tenant_id, sender) + values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 1) + + + update xhpc_message_board + + + sender_type = #{senderType,jdbcType=TINYINT}, + + + sender_account = #{senderAccount,jdbcType=VARCHAR}, + + + send_message_time = #{sendMessageTime,jdbcType=TIMESTAMP}, + + + message_content = #{messageContent,jdbcType=VARCHAR}, + + + tenant_type = #{tenantType,jdbcType=TINYINT}, + + + tenant_id = #{tenantId,jdbcType=VARCHAR}, + + + have_new_info = #{haveNewInfo,jdbcType=BOOLEAN}, + + + del_flag = #{delFlag,jdbcType=BOOLEAN}, + + + sender = #{sender,jdbcType=BOOLEAN}, + + + where message_id = #{messageId,jdbcType=BIGINT} + + + update xhpc_message_board + set sender_type = #{senderType,jdbcType=TINYINT}, + sender_account = #{senderAccount,jdbcType=VARCHAR}, + send_message_time = #{sendMessageTime,jdbcType=TIMESTAMP}, + message_content = #{messageContent,jdbcType=VARCHAR}, + tenant_type = #{tenantType,jdbcType=TINYINT}, + tenant_id = #{tenantId,jdbcType=VARCHAR}, + have_new_info = #{haveNewInfo,jdbcType=BOOLEAN}, + del_flag = #{delFlag,jdbcType=BOOLEAN}, + sender = #{sender,jdbcType=BOOLEAN} + where message_id = #{messageId,jdbcType=BIGINT} + + + UPDATE `xhpc_message_board` + SET have_new_info = 1 + WHERE + message_id IN + + #{messageId} + + AND del_flag IS NULL + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml new file mode 100644 index 00000000..4a24934c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + tenant_id + , + tenant_type, + sender_account, + sender_type, + user_icon, + have_new_info, + del_flag + + + insert into xhpc_message_board_receive_user (tenant_id, tenant_type, sender_account, + sender_type, user_icon, have_new_info, + del_flag) + values (#{tenantId,jdbcType=VARCHAR}, #{tenantType,jdbcType=INTEGER}, #{senderAccount,jdbcType=VARCHAR}, + #{senderType,jdbcType=INTEGER}, #{userIcon,jdbcType=VARCHAR}, #{haveNewInfo,jdbcType=BOOLEAN}, + #{delFlag,jdbcType=BOOLEAN}) + + + insert into xhpc_message_board_receive_user + + + tenant_id, + + + tenant_type, + + + sender_account, + + + sender_type, + + + user_icon, + + + have_new_info, + + + del_flag, + + + + + #{tenantId,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=INTEGER}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{senderType,jdbcType=INTEGER}, + + + #{userIcon,jdbcType=VARCHAR}, + + + #{haveNewInfo,jdbcType=BOOLEAN}, + + + #{delFlag,jdbcType=BOOLEAN}, + + + + + UPDATE xhpc_message_board_receive_user + SET have_new_info = 0 + WHERE tenant_type = #{tenantType} + AND tenant_id = #{tenantId} + AND sender_account = #{senderAccount} + AND sender_type = #{senderType} + AND del_flag IS NULL; + + + \ No newline at end of file From 52330aa54f4e732b9d17a2ca1985b3d2717ebfa8 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:42:04 +0800 Subject: [PATCH 35/55] =?UTF-8?q?=E5=A4=A7=E8=87=B4=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=94=E5=9B=9E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/XhpcMessageBoardApiController.java | 22 +++++++++++++++++++ .../service/XhpcMessageBoardService.java | 11 ++++++++++ .../impl/XhpcMessageBoardServiceImpl.java | 16 ++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java index 5ff82e64..f8fe9a4b 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -8,6 +8,7 @@ import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.enums.BusinessType; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -41,6 +42,13 @@ public class XhpcMessageBoardApiController extends BaseController { return AjaxResult.success(); } + /** + * 用户查看所发送的聊天记录 + * + * @author WH + * @date 2022/1/13 18:15 + * @since version-1.0 + */ @GetMapping("/user/message") public AjaxResult queryUserMessage(UserQueryCondition userQueryCondition) { @@ -48,4 +56,18 @@ public class XhpcMessageBoardApiController extends BaseController { return AjaxResult.success(queryUserMassageResponse); } + /** + * 获取用户对应的租户的头像 + * + * @author WH + * @date 2022/1/13 18:19 + * @since version-1.0 + */ + @GetMapping("/platform-icon") + public AjaxResult returnPlatformAvatar(@Param("tenantId") String tenantId, @Param("tenantType") Integer tenantType) { + + String avatarAddress = xhpcMessageBoardService.returnPlatformAvatar(tenantId, tenantType); + return AjaxResult.success(avatarAddress); + } + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index d03e5152..73aae832 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -45,5 +45,16 @@ public interface XhpcMessageBoardService { */ QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition); + /** + * 根据租户id和租户类型查询指定的租户头像 + * + * @param tenantId 租户id + * @param tenantType 租户类型 + * @return 头像地址 + * @author WH + * @date 2022/1/13 18:30 + * @since version-1.0 + */ + String returnPlatformAvatar(String tenantId, Integer tenantType); } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 57d1f8c0..51a78d6c 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -225,4 +225,20 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { return response; } + /** + * 根据租户id和租户类型查询指定的租户头像 + * + * @param tenantId 租户id + * @param tenantType 租户类型 + * @return 头像地址 + * @author WH + * @date 2022/1/13 18:30 + * @since version-1.0 + */ + @Override + public String returnPlatformAvatar(String tenantId, Integer tenantType) { + + return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; + } + } From 253667aece4c93474e56c3fe4e722b0bc6658b2b Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:59:55 +0800 Subject: [PATCH 36/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=9A=84Bug?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=B7=B2=E4=BD=BF=E5=8F=8C=E6=96=B9=E4=BB=BB?= =?UTF-8?q?=E6=84=8F=E4=B8=80=E6=96=B9=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E4=BC=9A=E4=BD=BF=E5=BE=97Redis=E4=B8=AD?= =?UTF-8?q?=E7=9A=84key=E7=9A=84=E6=9C=89=E6=95=88=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/board/controller/XhpcMessageBoardController.java | 7 +++++++ .../board/service/impl/XhpcMessageBoardServiceImpl.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java index 24c2b409..51afa483 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -24,6 +24,13 @@ public class XhpcMessageBoardController { @Resource XhpcMessageBoardService xhpcMessageBoardService; + /** + * 平台给用户发送消息 + * + * @author WH + * @date 2022/1/13 18:43 + * @since version-1.0 + */ @PostMapping("/platform/message") public AjaxResult platformSendMessageToUser(@RequestBody PlatformSendMessageToUserRequest platformRequest) { diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 51a78d6c..88e0d033 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -133,13 +133,13 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { String platformRedisKey = "PlatformMessageValidTime:" + "0:" + sysUser.getTenantId() + ":" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount(); Object cacheObject = redisService.getCacheObject(platformRedisKey); String currentTime; + String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); if (cacheObject == null) { //设置当前时间 currentTime = DateUtil.getYyyyMmDdHhMmSs(); redisService.setCacheObject(platformRedisKey, currentTime); redisService.expire(platformRedisKey, 60 * 5); //设置用户RedisKey的有效时间，保证双方时间数据同步 - String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); redisService.setCacheObject(userRedisKey, currentTime); redisService.expire(userRedisKey, 60 * 5); platformRequest.setSendMessageTime(currentTime); @@ -150,10 +150,12 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { } //reset redis key valid time redisService.expire(platformRedisKey, 60 * 5); + redisService.expire(userRedisKey, 60 * 5); platformRequest.setSendMessageTime((String) cacheObject); platformRequest.setTenantId(sysUser.getTenantId()); platformRequest.setTenantType(0); messageBoardMapper.insertPlatformMessage(platformRequest); + } /** @@ -237,7 +239,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { */ @Override public String returnPlatformAvatar(String tenantId, Integer tenantType) { - + //todo 查询数据库 return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; } From 3b9fbc5cc4dab422f8058fa69b18e8acb70108f6 Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 13 Jan 2022 19:07:34 +0800 Subject: [PATCH 37/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/mapper/XhpcHistoryOrderMapper.java | 4 +-- .../impl/XhpcChargeOrderServiceImpl.java | 30 ++++++++++++++++++- .../impl/XhpcHistoryOrderServiceImpl.java | 4 +-- .../mapper/XhpcChargeOrderMapper.xml | 3 -- .../mapper/XhpcHistoryOrderMapper.xml | 12 ++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java index 334dff6b..ed09318c 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java @@ -69,7 +69,7 @@ public interface XhpcHistoryOrderMapper { * @param historyOrderId * @return */ - Map gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId, @Param("type") Integer type, @Param("chargingOrderId") Long chargingOrderId, @Param("tenantId") String tenantId); + Map gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId, @Param("source") Integer source, @Param("chargingOrderId") Long chargingOrderId, @Param("tenantId") String tenantId); /** * 历史订单记录（PC） @@ -117,5 +117,5 @@ public interface XhpcHistoryOrderMapper { /** * 查询启动订单表 */ - Map getchargingOrderById(@Param("chargingOrderId")Long chargingOrderId); + Map getchargingOrderById(@Param("chargingOrderId")Long chargingOrderId,@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index 76be4198..b83c85ce 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -1,5 +1,7 @@ package com.xhpc.order.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.UserTypeService; @@ -17,9 +19,11 @@ import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.order.domain.XhpcChargeOrder; import com.xhpc.order.domain.XhpcOrderRedisRecord; +import com.xhpc.order.domain.XhpcRealTimeOrder; import com.xhpc.order.mapper.XhpcChargeOrderMapper; import com.xhpc.order.mapper.XhpcInternetUserMapper; import com.xhpc.order.service.IXhpcChargeOrderService; +import com.xhpc.order.service.IXhpcRealTimeOrderService; import com.xhpc.system.api.model.LoginUser; import org.bouncycastle.jcajce.provider.asymmetric.util.BaseAgreementSpi; import org.slf4j.Logger; @@ -58,6 +62,8 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar private TokenService tokenService; @Autowired private UserTypeService userTypeService; + @Autowired + private IXhpcRealTimeOrderService xhpcRealTimeOrderService; private static final Logger logger = LoggerFactory.getLogger(XhpcChargeOrderServiceImpl.class); //队列名称 @@ -90,7 +96,29 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar public List> getHistotyChargeOrderStatusList(HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); startPage(); - return xhpcChargeOrderMapper.getHistotyChargeOrderStatusList(loginUser.getUserid(),loginUser.getTenantId(),loginUser.getUserType()); + List> list = xhpcChargeOrderMapper.getHistotyChargeOrderStatusList(loginUser.getUserid(), loginUser.getTenantId(), loginUser.getUserType()); + if(list !=null && list.size()>0){ + for (int i = 0; i map = list.get(i); + //获取该订单最后一条实时数据 + Map cacheMap = redisService.getCacheMap("order:" + map.get("serialNumber").toString()); + if(cacheMap !=null && cacheMap.size()>0){ + List CacheRealtimeDataList = (List) cacheMap.get("realtimeDataList"); + if(CacheRealtimeDataList !=null && CacheRealtimeDataList.size()>0){ + CacheRealtimeData endData = CacheRealtimeDataList.get(list.size() - 1); + if (endData != null) { + map.put("actPrice", new BigDecimal(endData.getAmountCharged()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_DOWN)); + } + } + }else{ + XhpcRealTimeOrder endRealTimeOrder = xhpcRealTimeOrderService.getChargingOrderId(Long.valueOf(map.get("chargeOrderId").toString()), 2); + if (endRealTimeOrder != null) { + map.put("actPrice", endRealTimeOrder.getAmountCharged()); + } + } + } + } + return list; } @Override diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index e32078a3..84e52108 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -106,13 +106,13 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis public AjaxResult gethistotyOrderMessage(HttpServletRequest request, Long userId, Long historyOrderId, Integer type, Long chargingOrderId) { LoginUser loginUser = tokenService.getLoginUser(request); - Map map = xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, type, chargingOrderId, loginUser.getTenantId()); + Map map = xhpcHistoryOrderMapper.gethistotyOrderMessage(loginUser.getUserid(), historyOrderId, loginUser.getUserType(), chargingOrderId, loginUser.getTenantId()); if(map !=null){ return AjaxResult.success(map); } //查询最后一帧数据 if(chargingOrderId !=null){ - Map stringObjectMap = xhpcHistoryOrderMapper.getchargingOrderById(chargingOrderId); + Map stringObjectMap = xhpcHistoryOrderMapper.getchargingOrderById(chargingOrderId,loginUser.getUserid(),loginUser.getUserType(),loginUser.getTenantId()); if(stringObjectMap !=null){ //获取该订单最后一条实时数据 Map cacheMap = redisService.getCacheMap("order:" + stringObjectMap.get("serialNumber").toString()); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index ece34bd9..1e7e293f 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -327,15 +327,12 @@ cor.serial_number as serialNumber, cs.name as chargingStationName, ter.name as terminalName, - ho.history_order_id as historyOrderId, - ho.act_price as actPrice, cor.charging_time as chargingTime, cor.charging_degree as chargingDegree, cor.status as status from xhpc_charge_order as cor left join xhpc_charging_station as cs on cs.charging_station_id = cor.charging_station_id left join xhpc_terminal as ter on ter.terminal_id=cor.terminal_id - left join xhpc_history_order as ho on ho.charge_order_id = cor.charge_order_id where cor.status =2 and cor.del_flag =0 and cor.user_id=#{userId} diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 863127c7..0b24dafd 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -609,6 +609,9 @@ and ho.tenant_id =#{tenantId} + + and ho.source =#{source} + order by ho.create_time desc @@ -954,5 +957,14 @@ LEFT JOIN xhpc_terminal AS te ON te.terminal_id = co.terminal_id LEFT JOIN xhpc_charging_station AS cs ON cs.charging_station_id = co.charging_station_id where charge_order_id=#{chargingOrderId} + + and co.user_id = #{userId} + + + and co.source = #{source} + + + and co.tenant_id = #{tenantId} + From 091a91c4959b0a3e3f40903e29db2b46c9339e87 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 19:21:17 +0800 Subject: [PATCH 38/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AFredisKey=E6=9C=89=E6=95=88=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 88e0d033..91d0686d 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -61,13 +61,13 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { //使用Redis判断消息发送是否大于5分钟： Object cacheObject = redisService.getCacheObject(userRedisKey); String currentTime; + String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); if (cacheObject == null) { //设置当前时间 currentTime = DateUtil.getYyyyMmDdHhMmSs(); redisService.setCacheObject(userRedisKey, currentTime); redisService.expire(userRedisKey, 60 * 5); //设置平台RedisKey的有效时间，保证双方时间数据同步 - String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); redisService.setCacheObject(platformRedisKey, currentTime); redisService.expire(platformRedisKey, 60 * 5); userMessage.setSendMessageTime(currentTime); @@ -92,6 +92,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { } else { //reset redis key valid time redisService.expire(userRedisKey, 60 * 5); + redisService.expire(platformRedisKey, 60 * 5); currentTime = (String) cacheObject; userMessage.setSendMessageTime(currentTime); //设置用户账号，用户类型 From 3d60d60647a6a42250b5aa65cab369c60feb63e3 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 14 Jan 2022 09:19:20 +0800 Subject: [PATCH 39/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9deviceMessage=E8=A1=A8?= =?UTF-8?q?=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/v2.1.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/v2.1.sql b/sql/v2.1.sql index a1ce2890..3fbc485c 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -241,7 +241,7 @@ CREATE TABLE `xhpc_device_message` `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 '回复的报文', + `charge_order_no` varchar(50) default null 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 '创建者', From def32a3696f42fd3e2d36d5c940cfb50eed4222f Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Fri, 7 Jan 2022 17:59:40 +0800 Subject: [PATCH 40/55] =?UTF-8?q?=E6=90=AD=E5=BB=BA=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=9D=BF=E6=9C=8D=E5=8A=A1=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/pom.xml | 1 + xhpc-modules/xhpc-message-board/pom.xml | 143 ++++++++++++++++++ .../board/XhpcMessageBoardApplication.java | 37 +++++ .../api/XhpcMessageBoardApiController.java | 41 +++++ .../domain/SendMessageToPlatformRequest.java | 31 ++++ .../service/XhpcMessageBoardService.java | 12 ++ .../impl/XhpcMessageBoardServiceImpl.java | 5 + .../src/main/resources/banner.txt | 10 ++ .../src/main/resources/bootstrap.yml | 25 +++ .../src/main/resources/logback.xml | 75 +++++++++ 10 files changed, 380 insertions(+) create mode 100644 xhpc-modules/xhpc-message-board/pom.xml create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/banner.txt create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/logback.xml diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml index 561957dd..e5a4a82c 100644 --- a/xhpc-modules/pom.xml +++ b/xhpc-modules/pom.xml @@ -19,6 +19,7 @@ xhpc-wxma xhpc-invoice xhpc-tradebill + xhpc-message-board xhpc-modules diff --git a/xhpc-modules/xhpc-message-board/pom.xml b/xhpc-modules/xhpc-message-board/pom.xml new file mode 100644 index 00000000..efffedac --- /dev/null +++ b/xhpc-modules/xhpc-message-board/pom.xml @@ -0,0 +1,143 @@ + + + + xhpc-modules + com.ruoyi + 3.0.0 + + 4.0.0 + + xhpc-message-board + + + 留言板服务 + + + + 8 + 8 + + + + + + + junit + junit + + + + + 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 + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + mysql + mysql-connector-java + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-datascope + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + com.ruoyi + ruoyi-common-core + + + com.squareup.okhttp3 + okhttp + + + com.ruoyi + xhpc-common + 3.0.0 + compile + + + 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 + + + + + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java new file mode 100644 index 00000000..27a76f51 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java @@ -0,0 +1,37 @@ +package com.xhpc.board; + +import com.xhpc.common.security.annotation.EnableCustomConfig; +import com.xhpc.common.security.annotation.EnableRyFeignClients; +import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author WH + * @date 2021/12/7 14:55 + * @since version-1.0 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +@MapperScan("com.xhpc.board.mapper") +public class XhpcMessageBoardApplication { + + public static void main(String[] args) { + + SpringApplication.run(XhpcMessageBoardApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 留言板模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java new file mode 100644 index 00000000..eed7651e --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -0,0 +1,41 @@ +package com.xhpc.board.api; + +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.domain.AjaxResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 小程序的InvoiceController + * + * @author WH + * @date 2021/12/23 13:49 + * @since version-1.0 + */ +@RestController +@RequestMapping("/api/message-board/") +public class XhpcMessageBoardApiController extends BaseController { + + @Resource + XhpcMessageBoardService xhpcMessageBoardService; + + /** + * 用户发起聊天，发送聊天记录给平台客服 + * + * @author WH + * @date 2021/12/28 18:51 + * @since version-1.0 + */ + @PostMapping("/user/message") + public AjaxResult sendMessageToPlatform(@RequestBody SendMessageToPlatformRequest userMessage) { + + return AjaxResult.success(); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java new file mode 100644 index 00000000..1a7a2aa4 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java @@ -0,0 +1,31 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 用户所发送的信息的包装类 + * + * @author WH + * @date 2022/1/7 17:19 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class SendMessageToPlatformRequest { + + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("senderContent") + private String senderContent; + @JsonProperty("receiveId") + private String receiveId; + @JsonProperty("receiverType") + private Integer receiverType; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java new file mode 100644 index 00000000..cae8b8ce --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -0,0 +1,12 @@ +package com.xhpc.board.service; + +/** + * 留言板服务的Service + * + * @author WH + * @date 2022/1/7 17:57 + * @since version-1.0 + */ +public class XhpcMessageBoardService { + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java new file mode 100644 index 00000000..9fee818f --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -0,0 +1,5 @@ +package com.xhpc.board.service.impl; + +public class XhpcMessageBoardServiceImpl { + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt b/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt new file mode 100644 index 00000000..27cacb9c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ __ _ _ + (_) / _|(_)| | + _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ +| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ +| | | |_| || (_) || |_| || | | | | || || __/ +|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| + __/ | + |___/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..b4365277 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml @@ -0,0 +1,25 @@ +# Tomcat +server: + port: 9805 + +# Spring +spring: + application: + # 应用名称 + name: xhpc-message-board + 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} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml b/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml new file mode 100644 index 00000000..66683df0 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/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 + + + + + + + + + + + + + + + + + + From e2ab06708be00ec475353cdfb93562bdcdbab761 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Mon, 10 Jan 2022 13:16:35 +0800 Subject: [PATCH 41/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtokenService.getLoginUs?= =?UTF-8?q?er()=E8=BF=94=E5=9B=9ELoginUser=E4=B8=AD=E7=9A=84userType?= =?UTF-8?q?=E4=B8=BAnull=E7=9A=84=E9=97=AE=E9=A2=98=20by=20yy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/system/controller/SysUserController.java | 5 +++++ .../src/main/resources/mapper/system/SysUserMapper.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java index b001f44c..6430a50e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java @@ -11,6 +11,7 @@ import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; @@ -107,6 +108,10 @@ public class SysUserController extends BaseController { sysUserVo.setTenantId(sysUser.getTenantId()); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); + sysUserVo.setUsername(username); + sysUserVo.setUserType(UserTypeUtil.USER_TYPE); + sysUserVo.setUserTypeUtil(UserTypeUtil.USER); + sysUserVo.setUserid(sysUser.getUserId()); return R.ok(sysUserVo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 8e553c57..679b6328 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -27,6 +27,7 @@ + From fad1e6f7cc38e7a2b19177d648d2ebceed795beb Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:03:24 +0800 Subject: [PATCH 42/55] =?UTF-8?q?=E4=BC=98=E5=8C=96invoice=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E8=BF=94=E5=9B=9E=E7=BB=99=E5=89=8D=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=AF=AD=E5=8F=A5=20=E7=BB=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BC=80=E5=8F=91=E7=A5=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=8E=E5=8F=B0=E7=94=9F=E6=88=90=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5404=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E8=AE=A9=E5=85=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?null=E5=80=BC=20=E4=BF=AE=E6=94=B9bootrap.yml=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E8=B7=AF=E5=BE=84=EF=BC=8C=E8=AE=A9=E5=85=B6=E4=B8=BA?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=EF=BC=8C=E5=90=88=E5=B9=B6=E6=98=AF=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/system/api/model/LoginUser.java | 2 +- .../com/xhpc/common/api/UserTypeService.java | 4 +- .../{invoice => }/XhpcInvoiceApplication.java | 2 +- .../controller/XhpcInvoiceController.java | 2 +- .../service/impl/XhpcInvoiceServiceImpl.java | 60 +++++++++++-------- .../src/main/resources/bootstrap.yml | 3 +- .../XhpcInvoiceMapHistoryOrderMapper.xml | 1 + 7 files changed, 43 insertions(+), 31 deletions(-) rename xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/{invoice => }/XhpcInvoiceApplication.java (98%) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java index cae15e70..49878ee4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/model/LoginUser.java @@ -25,7 +25,7 @@ public class LoginUser implements Serializable private Long userid; /** - * 用户名 + * 用户账号（手机号、账号） */ private String username; diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java index 4508fe61..48058043 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/UserTypeService.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; +import java.util.Map; /** * @author yuyang @@ -18,11 +19,12 @@ public interface UserTypeService { /** * 根据手机号（账号），用户id和类型 获取用户信息 + * * @param * @return */ @GetMapping("/common/getUser") - R getUser(@RequestParam(value = "phone")String phone,@RequestParam(value = "userId")Long userId,@RequestParam(value = "userType")Integer userType,@RequestParam(value = "serialNumber")String serialNumber,@RequestParam(value = "tenantId")String tenantId); + R> getUser(@RequestParam(value = "phone") String phone, @RequestParam(value = "userId") Long userId, @RequestParam(value = "userType") Integer userType, @RequestParam(value = "serialNumber") String serialNumber, @RequestParam(value = "tenantId") String tenantId); diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java similarity index 98% rename from xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java rename to xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java index 51a0ad3d..f88706bd 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/XhpcInvoiceApplication.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/XhpcInvoiceApplication.java @@ -1,4 +1,4 @@ -package com.xhpc.invoice; +package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index efd09327..ed1b7f29 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -95,7 +95,7 @@ public class XhpcInvoiceController extends BaseController { public AjaxResult invoiceToUser(@RequestBody InvoiceToUserRequest requestData) { //前置条件 if (requestData.getInvoiceId() == null) { - return AjaxResult.error("必须传递未开发票id"); + return AjaxResult.error("必须上传发票id"); } if (requestData.getStatus() == null || requestData.getStatus().equals(InvoiceStatusConst.INVOICING)) { return AjaxResult.error("必须传递发票状态或发票状态不能为0"); diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index e2d32a27..2528d3e7 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -128,6 +128,8 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public Boolean invoiceToUser(InvoiceToUserRequest requestData) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); @@ -137,7 +139,14 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //从阿里云上下载下来电子发票 String fileUrl = requestData.getEletricInvoiceUrl(); File electricInvoiceFile = new File(environment.getProperty("file.serverStoreDisposableFileLocation") + "ElectricInvoice.pdf"); - HttpUtil.downloadFile(fileUrl, electricInvoiceFile); + try { + //参数1 文件下载路径 + //参数2 文件存放位置 + //服务器响应404 表示服务器找不到客户端所请求的资源 + HttpUtil.downloadFile(fileUrl, electricInvoiceFile); + } catch (Exception e) { + throw new RuntimeException("在阿里云上无法找到该文件，请检查上传的图片路径是否完整或有误"); + } try { MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); } catch (Exception e) { @@ -161,6 +170,8 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { @Override @Transactional(rollbackFor = Exception.class) public void failInvoiceToUser(InvoiceToUserRequest requestData) { + //获取当前时间 + requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs()); //根据操作人的id，查询操作人的名字 SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer())); requestData.setDrawer(sysUser.getNickName()); @@ -196,6 +207,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { public InvoiceTitleResponse findTitleInfo(String firmName) { List xhpcInvoiceList = xhpcInvoiceMapper.selectInvoiceTitleInfo(firmName); + InvoiceTitleResponse invoiceTitleResponse = new InvoiceTitleResponse(); + //如果没有记录，则返回空包装类 + if (xhpcInvoiceList.size() == 0) { + return invoiceTitleResponse; + } ArrayList dataDTOList = new ArrayList<>(); for (XhpcInvoice xhpcInvoice : xhpcInvoiceList) { InvoiceTitleResponse.DataDTO dataDTO = new InvoiceTitleResponse.DataDTO(); @@ -203,7 +219,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { dataDTO.setDutyNumber(xhpcInvoice.getDutyNumber()); dataDTOList.add(dataDTO); } - InvoiceTitleResponse invoiceTitleResponse = new InvoiceTitleResponse(); invoiceTitleResponse.setData(dataDTOList); return invoiceTitleResponse; } @@ -223,6 +238,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectUserLastInputInvoiceInfo(creatorId, creatorType); TitleResponse titleResponse = new TitleResponse(); + //如果数据库本身就没有数据，那么就返回空实体类对象 + if (xhpcInvoice == null) { + return titleResponse; + } BeanUtils.copyProperties(xhpcInvoice, titleResponse); return titleResponse; @@ -251,6 +270,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //查询该用户3个月内可以开发票的历史订单 List> xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList); InvoicedOrderResponse invoicedOrderResponse = new InvoicedOrderResponse(); + //没有则直接返回空对象出去 + if (xhpcHistoryOrderList.size() == 0) { + return invoicedOrderResponse; + } //设置该用户3个月内可以开发票的历史订单数量 invoicedOrderResponse.setTotalItems(xhpcHistoryOrderList.size()); //查询该用户所有可以开的发票的历史订单数量 @@ -312,29 +335,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { invoicedOrderResponse.setItems(itemsDTOS); return invoicedOrderResponse; -// //计算分页索引,放置到currentPage属性中 -// int startIndex = (invoicedOrdersRequest.getCurrentPage() - 1) * invoicedOrdersRequest.getItems(); -// invoicedOrdersRequest.setCurrentPage(startIndex); -// //先查询该用户被锁定了的订单，过滤掉它 -// List lockOrderNumberList = xhpcInvoiceMapHistoryOrderMapper.findLockOrdersByUserIdAndUserType(invoicedOrdersRequest); -// //查询该用户3个月内可以开发票的历史订单 -// List xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList); -// ArrayList itemsDTOList = new ArrayList<>(); -// for (XhpcHistoryOrder xhpcHistoryOrder : xhpcHistoryOrderList) { -// InvoiceOrdersResponse.ItemsDTO itemsDTO = new InvoiceOrdersResponse.ItemsDTO(); -// itemsDTO.setOrderId(xhpcHistoryOrder.getHistoryOrderId()); -// itemsDTO.setOrderNumber(xhpcHistoryOrder.getSerialNumber()); -// itemsDTO.setOrderMoney(xhpcHistoryOrder.getActPrice()); -// itemsDTO.setOrderTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, xhpcHistoryOrder.getCreateTime())); -// itemsDTOList.add(itemsDTO); -// } -// InvoiceOrdersResponse invoiceOrdersResponse = new InvoiceOrdersResponse(); -// invoiceOrdersResponse.setItems(itemsDTOList); -// //查询该用户所有可以开发票的历史订单的数量 -// Long allOrdersCount = xhpcHistoryOrderMapper.findAllOrdersByCondition(invoicedOrdersRequest, lockOrderNumberList); -// invoiceOrdersResponse.setTotalItems(allOrdersCount); -// return invoiceOrdersResponse; - } /** @@ -353,6 +353,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //对拷发票部分数据 XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectByPrimaryKey(invoiceId); SpecificInvoicedResponse specificInvoicedResponse = new SpecificInvoicedResponse(); + //查不出来返回空包装类 + if (xhpcInvoice == null) { + return specificInvoicedResponse; + } specificInvoicedResponse.setCreatorTime(DateUtils.parseDateToStr(xhpcInvoice.getCreateTime())); specificInvoicedResponse.setReceiveEmail(xhpcInvoice.getReceiveEmail()); specificInvoicedResponse.setTitleType(xhpcInvoice.getTitleType()); @@ -462,6 +466,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { invoiceHistoryRecordsRequest.setCurrentPage(startIndex); //获取该用户所提交的每个发票信息 List invoicesList = xhpcInvoiceMapper.findInvoicesByCreatorIdAndCreatorType(invoiceHistoryRecordsRequest); + //如果为0，那么则返回空的实体类出去 + InvoiceHistoryRecordsResponse invoiceHistoryRecordsResponse = new InvoiceHistoryRecordsResponse(); + if (invoicesList.size() == 0) { + return invoiceHistoryRecordsResponse; + } //实体类对拷 ArrayList itemsDTOS = new ArrayList<>(); for (XhpcInvoice xhpcInvoice : invoicesList) { @@ -473,7 +482,6 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { itemsDTO.setIsRead(xhpcInvoice.getIsRead()); itemsDTOS.add(itemsDTO); } - InvoiceHistoryRecordsResponse invoiceHistoryRecordsResponse = new InvoiceHistoryRecordsResponse(); invoiceHistoryRecordsResponse.setItems(itemsDTOS); Long userInvoiceItems = xhpcInvoiceMapper.getUserInvoiceItemsByCreatorIdAndCreatorType(invoiceHistoryRecordsRequest.getCreatorId(), invoiceHistoryRecordsRequest.getCreatorType()); invoiceHistoryRecordsResponse.setTotalItems(userInvoiceItems); diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml index 9f962452..adcb25c9 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/bootstrap.yml @@ -37,4 +37,5 @@ oss: #文件路径 file: aliyunPath: invoicePdf/ - serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ \ No newline at end of file + # serverStoreDisposableFileLocation: /www/wwwroot/xhpc.scxhua.com/disposableFiles/ + serverStoreDisposableFileLocation: C:\\www\\wwwroot\\xhpc.scxhua.com\\disposableFiles\\ \ No newline at end of file diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml index 08622bd6..783c6d8d 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapHistoryOrderMapper.xml @@ -1,5 +1,6 @@ + From a8298d868a8c98c026cd0145646091c123e69859 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:09:53 +0800 Subject: [PATCH 43/55] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BB=99=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=8F=91=E9=80=81=E8=81=8A=E5=A4=A9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=AE=8C=E6=88=90=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E5=8F=B0=E6=89=80=E5=8F=91=E9=80=81=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=E5=A4=A7?= =?UTF-8?q?=E8=87=B4=E5=AE=8C=E6=88=90=E5=B9=B3=E5=8F=B0=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=99=E7=94=A8=E6=88=B7=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C=E6=89=93=E5=8D=B0Mybatis?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcMessageBoardApplication.java | 2 +- .../api/XhpcMessageBoardApiController.java | 22 +- .../XhpcMessageBoardController.java | 35 +++ .../board/domain/PlatformQueryCondition.java | 29 ++ .../PlatformSendMessageToUserRequest.java | 31 ++ .../domain/QueryUserMassageResponse.java | 48 +++ .../domain/SendMessageToPlatformRequest.java | 12 +- .../xhpc/board/domain/UserQueryCondition.java | 29 ++ .../board/mapper/XhpcMessageBoardMapper.java | 97 ++++++ .../XhpcMessageBoardReceiveUserMapper.java | 40 +++ .../com/xhpc/board/pojo/XhpcMessageBoard.java | 68 ++++ .../pojo/XhpcMessageBoardReceiveUser.java | 52 ++++ .../service/XhpcMessageBoardService.java | 39 ++- .../impl/XhpcMessageBoardServiceImpl.java | 225 +++++++++++++- .../src/main/resources/bootstrap.yml | 5 +- .../mapper/XhpcMessageBoardMapper.xml | 292 ++++++++++++++++++ .../XhpcMessageBoardReceiveUserMapper.xml | 102 ++++++ 17 files changed, 1112 insertions(+), 16 deletions(-) rename xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/{board => }/XhpcMessageBoardApplication.java (98%) create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml create mode 100644 xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java similarity index 98% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java rename to xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java index 27a76f51..36f0e453 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/XhpcMessageBoardApplication.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java @@ -1,4 +1,4 @@ -package com.xhpc.board; +package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java index eed7651e..5ff82e64 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -1,13 +1,14 @@ package com.xhpc.board.api; +import com.xhpc.board.domain.QueryUserMassageResponse; import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; import com.xhpc.board.service.XhpcMessageBoardService; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -19,7 +20,7 @@ import javax.annotation.Resource; * @since version-1.0 */ @RestController -@RequestMapping("/api/message-board/") +@RequestMapping("/api/message-board") public class XhpcMessageBoardApiController extends BaseController { @Resource @@ -33,9 +34,18 @@ public class XhpcMessageBoardApiController extends BaseController { * @since version-1.0 */ @PostMapping("/user/message") + @Log(title = "留言板-用户发送聊天信息", businessType = BusinessType.INSERT) public AjaxResult sendMessageToPlatform(@RequestBody SendMessageToPlatformRequest userMessage) { + xhpcMessageBoardService.writeUserMessageToDb(userMessage); return AjaxResult.success(); } -} + @GetMapping("/user/message") + public AjaxResult queryUserMessage(UserQueryCondition userQueryCondition) { + + QueryUserMassageResponse queryUserMassageResponse = xhpcMessageBoardService.queryUserMessage(userQueryCondition); + return AjaxResult.success(queryUserMassageResponse); + } + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java new file mode 100644 index 00000000..24c2b409 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -0,0 +1,35 @@ +package com.xhpc.board.controller; + +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.core.web.domain.AjaxResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 留言板服务Controller + * + * @author WH + * @date 2022/1/10 10:02 + * @since version-1.0 + */ +@RestController +@RequestMapping("/board") +public class XhpcMessageBoardController { + + @Resource + XhpcMessageBoardService xhpcMessageBoardService; + + @PostMapping("/platform/message") + public AjaxResult platformSendMessageToUser(@RequestBody PlatformSendMessageToUserRequest platformRequest) { + + xhpcMessageBoardService.platformSendMessageToUser(platformRequest); + + return AjaxResult.success(); + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java new file mode 100644 index 00000000..2d36a24c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java @@ -0,0 +1,29 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 平台查询条件 + * + * @author WH + * @date 2022/1/12 15:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class PlatformQueryCondition { + + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java new file mode 100644 index 00000000..943e408a --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java @@ -0,0 +1,31 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 平台向用户发送的信息包装类 + * + * @author WH + * @date 2022/1/11 13:47 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class PlatformSendMessageToUserRequest { + + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("messageContent") + private String messageContent; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java new file mode 100644 index 00000000..7bf9fb9e --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java @@ -0,0 +1,48 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 查询用户信息的返回封装数据类 + * + * @author WH + * @date 2022/1/13 10:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class QueryUserMassageResponse { + + @JsonProperty("nextQueryTime") + private String nextQueryTime; + @JsonProperty("data") + private List data; + + @NoArgsConstructor + @Data + public static class DataDTO { + + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + @JsonProperty("messageContent") + private String messageContent; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("have_new_info") + private Integer haveNewInfo; + @JsonProperty("sender") + private Integer sender; + + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java index 1a7a2aa4..6b950fa3 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java @@ -21,11 +21,11 @@ public class SendMessageToPlatformRequest { private String senderAccount; @JsonProperty("senderType") private Integer senderType; - @JsonProperty("senderContent") - private String senderContent; - @JsonProperty("receiveId") - private String receiveId; - @JsonProperty("receiverType") - private Integer receiverType; + @JsonProperty("messageContent") + private String messageContent; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java new file mode 100644 index 00000000..cc8a35b3 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java @@ -0,0 +1,29 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 用户查询条件 + * + * @author WH + * @date 2022/1/12 15:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class UserQueryCondition { + + @JsonProperty("senderAccount") + private String senderAccount; + @JsonProperty("senderType") + private Integer senderType; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + @JsonProperty("sendMessageTime") + private String sendMessageTime; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java new file mode 100644 index 00000000..2bd03c28 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java @@ -0,0 +1,97 @@ +package com.xhpc.board.mapper; + +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.pojo.XhpcMessageBoard; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface XhpcMessageBoardMapper { + + int deleteByPrimaryKey(Long messageId); + + int insert(XhpcMessageBoard record); + + int insertSelective(XhpcMessageBoard record); + + XhpcMessageBoard selectByPrimaryKey(Long messageId); + + int updateByPrimaryKeySelective(XhpcMessageBoard record); + + int updateByPrimaryKey(XhpcMessageBoard record); + + /** + * 用户端存入时间记录 + * + * @param userMessage 用户时间记录信息 + * @author WH + * @date 2022/1/11 17:46 + * @since version-1.0 + */ + void insertUserTimeMessageRecord(SendMessageToPlatformRequest userMessage); + + /** + * 用户端存入发送的消息 + * + * @param userMessage 用户发送的消息 + * @author WH + * @date 2022/1/11 18:16 + * @since version-1.0 + */ + void insertUserMessage(SendMessageToPlatformRequest userMessage); + + /** + * 平台端存入发送的信息 + * + * @param platformRequest 平台所要发送给用户的信息 + * @author WH + * @date 2022/1/12 11:30 + * @since version-1.0 + */ + void insertPlatformMessage(PlatformSendMessageToUserRequest platformRequest); + + /** + * 平台端存入时间记录 + * + * @param platformRequest 平台时间记录信息 + * @author WH + * @date 2022/1/12 11:49 + * @since version-1.0 + */ + void insertPlatformTimeMessageRecord(PlatformSendMessageToUserRequest platformRequest); + + /** + * 查询用户一个月的记录 + * + * @param userQueryCondition 用户查询条件 + * @param nextTimeStr 上一个月的时间 + * @return 返回一个装有一个月的数据的集合 + * @author WH + * @date 2022/1/12 16:03 + * @since version-1.0 + */ + List selectBy(@Param("userQueryCondition") UserQueryCondition userQueryCondition, @Param("nextTimeStr") String nextTimeStr); + + /** + * 给查询出来的记录，添加用户已读状态 + * + * @param messageIdList 查询出来的记录的id集合 + * @author WH + * @date 2022/1/13 10:16 + * @since version-1.0 + */ + void setUserReadedStatus(List messageIdList); + + /** + * 查询用户所有时间记录 + * + * @param userQueryCondition 用户信息 + * @author WH + * @date 2022/1/13 10:56 + * @since version-1.0 + */ + List selectTimeRecords(UserQueryCondition userQueryCondition); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java new file mode 100644 index 00000000..54ae11b7 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java @@ -0,0 +1,40 @@ +package com.xhpc.board.mapper; + +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; + +/** + * the mapper of the xhpc_message_board_receive_user + * + * @author WH + * @date 2022/1/11 10:26 + * @since version-1.0 + */ +public interface XhpcMessageBoardReceiveUserMapper { + + int insert(XhpcMessageBoardReceiveUser record); + + int insertSelective(XhpcMessageBoardReceiveUser record); + + /** + * 通过用户id，用户类型，租户id，租户类型，查询指定记录 + * + * @param userMessage 储存条件的包装类 + * @return 指定记录 + * @author WH + * @date 2022/1/10 18:03 + * @since version-1.0 + */ + XhpcMessageBoardReceiveUser findOneByCondition(SendMessageToPlatformRequest userMessage); + + /** + * 将指定用户记录have_new_info字段的值，将其设置为0，即该用户发送了新消息 + * + * @param userMessage 指定要更新哪个记录的条件 + * @author WH + * @date 2022/1/11 10:31 + * @since version-1.0 + */ + void updateHaveNewInfoFiledByUserCondition(SendMessageToPlatformRequest userMessage); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java new file mode 100644 index 00000000..2c41e605 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java @@ -0,0 +1,68 @@ +package com.xhpc.board.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * xhpc_message_board + * + * @author WH + */ +@Data +public class XhpcMessageBoard implements Serializable { + + /** + * 消息id + */ + private Long messageId; + + /** + * 用户类型 + */ + private Integer senderType; + + /** + * 用户账号 + */ + private String senderAccount; + + /** + * 发送消息的时间 + */ + private Date sendMessageTime; + + /** + * 消息内容 + */ + private String messageContent; + + /** + * 租户类型 + */ + private Integer tenantType; + + /** + * 租户id（平台id） + */ + private String tenantId; + + /** + * 租户发送的消息，用户是否已读，默认为null，表示未读，0表示已读 + */ + private Integer haveNewInfo; + + /** + * 逻辑删除字段 + */ + private Integer delFlag; + + /** + * 发送者（0，用户，1，时间，2，平台（租户）） + */ + private Integer sender; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java new file mode 100644 index 00000000..f71d6430 --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java @@ -0,0 +1,52 @@ +package com.xhpc.board.pojo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * xhpc_message_board_receive_user + * + * @author WH + */ +@Data +public class XhpcMessageBoardReceiveUser implements Serializable { + + /** + * 接收者id（租户id） + */ + private String tenantId; + + /** + * 接收者类型（租户类型） + */ + private Integer tenantType; + + /** + * 发送者账号 + */ + private String senderAccount; + + /** + * 发送者类型（0 C端用户 1 流量方用户 2社区用户 3B端用户） + */ + private Integer senderType; + + /** + * 用户头像地址 + */ + private String userIcon; + + /** + * 是否有新消息（null表示有新消息，0表示没有） + */ + private Integer haveNewInfo; + + /** + * 逻辑删除（0为删除） + */ + private Integer delFlag; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index cae8b8ce..d03e5152 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -1,5 +1,10 @@ package com.xhpc.board.service; +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.QueryUserMassageResponse; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; + /** * 留言板服务的Service * @@ -7,6 +12,38 @@ package com.xhpc.board.service; * @date 2022/1/7 17:57 * @since version-1.0 */ -public class XhpcMessageBoardService { +public interface XhpcMessageBoardService { + + /** + * 将用户发送的信息保存到数据库中 + * + * @param userMessage 用户发送的信息 + * @author WH + * @date 2022/1/10 14:17 + * @since version-1.0 + */ + void writeUserMessageToDb(SendMessageToPlatformRequest userMessage); + + /** + * 将平台（租户）发送的信息保存到数据库中 + * + * @param platformRequest 平台消息 + * @author WH + * @date 2022/1/11 13:58 + * @since version-1.0 + */ + void platformSendMessageToUser(PlatformSendMessageToUserRequest platformRequest); + + /** + * 根据用户条件，查询指定的数据库中的记录 + * + * @param userQueryCondition 用户传入的条件 + * @return 用户在数据库中发送的记录 + * @author WH + * @date 2022/1/12 15:30 + * @since version-1.0 + */ + QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition); + } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 9fee818f..57d1f8c0 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -1,5 +1,228 @@ package com.xhpc.board.service.impl; -public class XhpcMessageBoardServiceImpl { +import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.QueryUserMassageResponse; +import com.xhpc.board.domain.SendMessageToPlatformRequest; +import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.mapper.XhpcMessageBoardMapper; +import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper; +import com.xhpc.board.pojo.XhpcMessageBoard; +import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; +import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.domain.R; +import com.xhpc.common.core.utils.DateUtils; +import com.xhpc.common.core.utils.bean.BeanUtils; +import com.xhpc.common.redis.service.RedisService; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.DateUtil; +import com.xhpc.system.api.domain.SysUser; +import com.xhpc.system.api.model.LoginUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 留言板实现类 + * + * @author WH + */ +@Service +public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { + + @Resource + TokenService tokenService; + @Resource + XhpcMessageBoardMapper messageBoardMapper; + @Resource + XhpcMessageBoardReceiveUserMapper xhpcMessageBoardReceiveUserMapper; + @Resource + RedisService redisService; + @Resource + UserTypeService userTypeService; + + + /** + * 将用户发送的信息保存到数据库中 + * + * @param userMessage 用户发送的信息 + * @author WH + * @date 2022/1/10 14:17 + * @since version-1.0 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void writeUserMessageToDb(SendMessageToPlatformRequest userMessage) { + //解析Token，获取用户与平台用户信息 + LoginUser loginUser = tokenService.getLoginUser(); + String userRedisKey = "userMessageValidTime:" + loginUser.getUserType() + ":" + loginUser.getUserid() + ":" + userMessage.getTenantType() + ":" + userMessage.getTenantId(); + //使用Redis判断消息发送是否大于5分钟： + Object cacheObject = redisService.getCacheObject(userRedisKey); + String currentTime; + if (cacheObject == null) { + //设置当前时间 + currentTime = DateUtil.getYyyyMmDdHhMmSs(); + redisService.setCacheObject(userRedisKey, currentTime); + redisService.expire(userRedisKey, 60 * 5); + //设置平台RedisKey的有效时间，保证双方时间数据同步 + String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); + redisService.setCacheObject(platformRedisKey, currentTime); + redisService.expire(platformRedisKey, 60 * 5); + userMessage.setSendMessageTime(currentTime); + userMessage.setSenderAccount(loginUser.getUsername()); + userMessage.setSenderType(loginUser.getUserType()); + messageBoardMapper.insertUserTimeMessageRecord(userMessage); + messageBoardMapper.insertUserMessage(userMessage); + XhpcMessageBoardReceiveUser receiverUser = xhpcMessageBoardReceiveUserMapper.findOneByCondition(userMessage); + if (receiverUser == null) { + XhpcMessageBoardReceiveUser xhpcMessageBoardReceiveUser = new XhpcMessageBoardReceiveUser(); + BeanUtils.copyProperties(userMessage, xhpcMessageBoardReceiveUser); + //发送请求所返回的响应信息 + R> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId()); + Map userInfo = result.getData(); + String avatar = (String) userInfo.get("avatar"); + xhpcMessageBoardReceiveUser.setUserIcon(avatar); + xhpcMessageBoardReceiveUser.setHaveNewInfo(0); + xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); + } else { + xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + } + } else { + //reset redis key valid time + redisService.expire(userRedisKey, 60 * 5); + currentTime = (String) cacheObject; + userMessage.setSendMessageTime(currentTime); + //设置用户账号，用户类型 + userMessage.setSenderAccount(loginUser.getUsername()); + userMessage.setSenderType(loginUser.getUserType()); + messageBoardMapper.insertUserMessage(userMessage); + //向租户显示的列表中添加该用户信息，表示该用户来新消息了，如果列表中已经有该用户了，则只更新状态即可。 + XhpcMessageBoardReceiveUser receiverUser = xhpcMessageBoardReceiveUserMapper.findOneByCondition(userMessage); + if (receiverUser == null) { + XhpcMessageBoardReceiveUser xhpcMessageBoardReceiveUser = new XhpcMessageBoardReceiveUser(); + BeanUtils.copyProperties(userMessage, xhpcMessageBoardReceiveUser); + //发送请求所返回的响应信息 + R> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId()); + Map userInfo = result.getData(); + String avatar = (String) userInfo.get("avatar"); + xhpcMessageBoardReceiveUser.setUserIcon(avatar); + xhpcMessageBoardReceiveUser.setHaveNewInfo(0); + xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); + } else { + xhpcMessageBoardReceiveUserMapper.updateHaveNewInfoFiledByUserCondition(userMessage); + } + } + } + + /** + * 将平台（租户）发送的信息保存到数据库中 + * + * @param platformRequest 平台消息 + * @author WH + * @date 2022/1/11 13:58 + * @since version-1.0 + */ + @Override + public void platformSendMessageToUser(PlatformSendMessageToUserRequest platformRequest) { + + //获取平台用户信息 + SysUser sysUser = tokenService.getLoginUser().getSysUser(); + //使用redis控制发送时间 + String platformRedisKey = "PlatformMessageValidTime:" + "0:" + sysUser.getTenantId() + ":" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount(); + Object cacheObject = redisService.getCacheObject(platformRedisKey); + String currentTime; + if (cacheObject == null) { + //设置当前时间 + currentTime = DateUtil.getYyyyMmDdHhMmSs(); + redisService.setCacheObject(platformRedisKey, currentTime); + redisService.expire(platformRedisKey, 60 * 5); + //设置用户RedisKey的有效时间，保证双方时间数据同步 + String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); + redisService.setCacheObject(userRedisKey, currentTime); + redisService.expire(userRedisKey, 60 * 5); + platformRequest.setSendMessageTime(currentTime); + platformRequest.setTenantId(sysUser.getTenantId()); + platformRequest.setTenantType(0); + messageBoardMapper.insertPlatformTimeMessageRecord(platformRequest); + messageBoardMapper.insertPlatformMessage(platformRequest); + } + //reset redis key valid time + redisService.expire(platformRedisKey, 60 * 5); + platformRequest.setSendMessageTime((String) cacheObject); + platformRequest.setTenantId(sysUser.getTenantId()); + platformRequest.setTenantType(0); + messageBoardMapper.insertPlatformMessage(platformRequest); + } + + /** + * 根据用户条件，查询指定的数据库中的记录 + * + * @param userQueryCondition 用户传入的条件 + * @author WH + * @date 2022/1/12 15:30 + * @since version-1.0 + */ + @Override + public QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition) { + //完善条件集合 + LoginUser loginUser = tokenService.getLoginUser(); + userQueryCondition.setSenderAccount(loginUser.getUsername()); + userQueryCondition.setSenderType(loginUser.getUserType()); + String nextTimeStr = null; + if ("".equals(userQueryCondition.getSendMessageTime()) || userQueryCondition.getSendMessageTime() == null || "null".equals(userQueryCondition.getSendMessageTime())) { + userQueryCondition.setSendMessageTime(DateUtil.getYyyyMmDdHhMmSs()); + //查询用户是否有数据，即查询该用户的所有时间记录（有时间记录表示该用户发送过信息） + List allTimeRecords = messageBoardMapper.selectTimeRecords(userQueryCondition); + QueryUserMassageResponse queryUserMassageResponse = new QueryUserMassageResponse(); + if (allTimeRecords.size() == 0) { + return queryUserMassageResponse; + } + //获取最后一个时间记录，将其减去一个月，放入查询条件中 + XhpcMessageBoard xhpcMessageBoard = allTimeRecords.get(allTimeRecords.size() - 1); + Date finalTime = xhpcMessageBoard.getSendMessageTime(); + userQueryCondition.setSendMessageTime(DateUtils.parseDateToStr(finalTime)); + Calendar finalTimeCalendar = DateUtil.getCalendar(finalTime); + finalTimeCalendar.add(Calendar.MONTH, -1); + Date nextTime = finalTimeCalendar.getTime(); + nextTimeStr = DateUtils.parseDateToStr(nextTime); + } else { + //如果有值过来，说明有之前的记录，计算上一个月的值，作为查询条件，并返回 + String sendMessageTimeStr = userQueryCondition.getSendMessageTime(); + Date sendMessageTimeDate = DateUtils.parseDate(sendMessageTimeStr); + Calendar nextTimeCalendar = DateUtil.getCalendar(sendMessageTimeDate); + nextTimeCalendar.add(Calendar.MONTH, -1); + Date nextTime = nextTimeCalendar.getTime(); + nextTimeStr = DateUtils.parseDateToStr(nextTime); + } + //根据用户信息中所保存的时间，与上个月时间进行区间查询 + List aMonthRecords = messageBoardMapper.selectBy(userQueryCondition, nextTimeStr); + //如果没有数据，则返回空实体类对象 + QueryUserMassageResponse response = new QueryUserMassageResponse(); + if (aMonthRecords.size() == 0) { + return response; + } + List messageIdList = new ArrayList<>(); + for (int index = 0; index <= aMonthRecords.size() - 1; index++) { + Long messageId = aMonthRecords.get(index).getMessageId(); + messageIdList.add(messageId); + } + //设置查询出来的记录为已读状态 + messageBoardMapper.setUserReadedStatus(messageIdList); + //封装数据 + ArrayList dataDTOS = new ArrayList<>(); + for (XhpcMessageBoard aMonthRecord : aMonthRecords) { + QueryUserMassageResponse.DataDTO dataDTO = new QueryUserMassageResponse.DataDTO(); + BeanUtils.copyProperties(aMonthRecord, dataDTO); + dataDTO.setSendMessageTime(DateUtils.parseDateToStr(aMonthRecord.getSendMessageTime())); + dataDTOS.add(dataDTO); + } + //处理下次查询时间 + //todo 截取时间 + response.setNextQueryTime(nextTimeStr); + response.setData(dataDTOS); + return response; + } } diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml index b4365277..c0bbf680 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml @@ -22,4 +22,7 @@ spring: file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.xhpc.board.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml new file mode 100644 index 00000000..0f2c01bf --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + message_id + , sender_type, sender_account, send_message_time, message_content, tenant_type, + tenant_id, have_new_info, del_flag, sender + + + + + + delete + from xhpc_message_board + where message_id = #{messageId,jdbcType=BIGINT} + + + insert into xhpc_message_board (sender_type, sender_account, send_message_time, + message_content, tenant_type, tenant_id, + have_new_info, del_flag, sender) + values (#{senderType,jdbcType=TINYINT}, #{senderAccount,jdbcType=VARCHAR}, + #{sendMessageTime,jdbcType=TIMESTAMP}, + #{messageContent,jdbcType=VARCHAR}, #{tenantType,jdbcType=TINYINT}, #{tenantId,jdbcType=VARCHAR}, + #{haveNewInfo,jdbcType=BOOLEAN}, #{delFlag,jdbcType=BOOLEAN}, #{sender,jdbcType=BOOLEAN}) + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + + have_new_info, + + + del_flag, + + + sender, + + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + + #{haveNewInfo,jdbcType=BOOLEAN}, + + + #{delFlag,jdbcType=BOOLEAN}, + + + #{sender,jdbcType=BOOLEAN}, + + + + + insert into xhpc_message_board + (sender_type, sender_account, send_message_time, tenant_type, tenant_id, sender) + values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 1) + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + have_new_info, + sender, + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + 0, + 0, + + + + insert into xhpc_message_board + + + sender_type, + + + sender_account, + + + send_message_time, + + + message_content, + + + tenant_type, + + + tenant_id, + + have_new_info, + sender, + + + + #{senderType,jdbcType=TINYINT}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{sendMessageTime,jdbcType=TIMESTAMP}, + + + #{messageContent,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=TINYINT}, + + + #{tenantId,jdbcType=VARCHAR}, + + 0, + 2, + + + + insert into xhpc_message_board + (sender_type, sender_account, send_message_time, tenant_type, tenant_id, sender) + values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 1) + + + update xhpc_message_board + + + sender_type = #{senderType,jdbcType=TINYINT}, + + + sender_account = #{senderAccount,jdbcType=VARCHAR}, + + + send_message_time = #{sendMessageTime,jdbcType=TIMESTAMP}, + + + message_content = #{messageContent,jdbcType=VARCHAR}, + + + tenant_type = #{tenantType,jdbcType=TINYINT}, + + + tenant_id = #{tenantId,jdbcType=VARCHAR}, + + + have_new_info = #{haveNewInfo,jdbcType=BOOLEAN}, + + + del_flag = #{delFlag,jdbcType=BOOLEAN}, + + + sender = #{sender,jdbcType=BOOLEAN}, + + + where message_id = #{messageId,jdbcType=BIGINT} + + + update xhpc_message_board + set sender_type = #{senderType,jdbcType=TINYINT}, + sender_account = #{senderAccount,jdbcType=VARCHAR}, + send_message_time = #{sendMessageTime,jdbcType=TIMESTAMP}, + message_content = #{messageContent,jdbcType=VARCHAR}, + tenant_type = #{tenantType,jdbcType=TINYINT}, + tenant_id = #{tenantId,jdbcType=VARCHAR}, + have_new_info = #{haveNewInfo,jdbcType=BOOLEAN}, + del_flag = #{delFlag,jdbcType=BOOLEAN}, + sender = #{sender,jdbcType=BOOLEAN} + where message_id = #{messageId,jdbcType=BIGINT} + + + UPDATE `xhpc_message_board` + SET have_new_info = 1 + WHERE + message_id IN + + #{messageId} + + AND del_flag IS NULL + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml new file mode 100644 index 00000000..4a24934c --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + tenant_id + , + tenant_type, + sender_account, + sender_type, + user_icon, + have_new_info, + del_flag + + + insert into xhpc_message_board_receive_user (tenant_id, tenant_type, sender_account, + sender_type, user_icon, have_new_info, + del_flag) + values (#{tenantId,jdbcType=VARCHAR}, #{tenantType,jdbcType=INTEGER}, #{senderAccount,jdbcType=VARCHAR}, + #{senderType,jdbcType=INTEGER}, #{userIcon,jdbcType=VARCHAR}, #{haveNewInfo,jdbcType=BOOLEAN}, + #{delFlag,jdbcType=BOOLEAN}) + + + insert into xhpc_message_board_receive_user + + + tenant_id, + + + tenant_type, + + + sender_account, + + + sender_type, + + + user_icon, + + + have_new_info, + + + del_flag, + + + + + #{tenantId,jdbcType=VARCHAR}, + + + #{tenantType,jdbcType=INTEGER}, + + + #{senderAccount,jdbcType=VARCHAR}, + + + #{senderType,jdbcType=INTEGER}, + + + #{userIcon,jdbcType=VARCHAR}, + + + #{haveNewInfo,jdbcType=BOOLEAN}, + + + #{delFlag,jdbcType=BOOLEAN}, + + + + + UPDATE xhpc_message_board_receive_user + SET have_new_info = 0 + WHERE tenant_type = #{tenantType} + AND tenant_id = #{tenantId} + AND sender_account = #{senderAccount} + AND sender_type = #{senderType} + AND del_flag IS NULL; + + + \ No newline at end of file From 366623bdebc52380c92f6cd9af7dff7693e02249 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:42:04 +0800 Subject: [PATCH 44/55] =?UTF-8?q?=E5=A4=A7=E8=87=B4=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=94=E5=9B=9E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/XhpcMessageBoardApiController.java | 22 +++++++++++++++++++ .../service/XhpcMessageBoardService.java | 11 ++++++++++ .../impl/XhpcMessageBoardServiceImpl.java | 16 ++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java index 5ff82e64..f8fe9a4b 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java @@ -8,6 +8,7 @@ import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.enums.BusinessType; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -41,6 +42,13 @@ public class XhpcMessageBoardApiController extends BaseController { return AjaxResult.success(); } + /** + * 用户查看所发送的聊天记录 + * + * @author WH + * @date 2022/1/13 18:15 + * @since version-1.0 + */ @GetMapping("/user/message") public AjaxResult queryUserMessage(UserQueryCondition userQueryCondition) { @@ -48,4 +56,18 @@ public class XhpcMessageBoardApiController extends BaseController { return AjaxResult.success(queryUserMassageResponse); } + /** + * 获取用户对应的租户的头像 + * + * @author WH + * @date 2022/1/13 18:19 + * @since version-1.0 + */ + @GetMapping("/platform-icon") + public AjaxResult returnPlatformAvatar(@Param("tenantId") String tenantId, @Param("tenantType") Integer tenantType) { + + String avatarAddress = xhpcMessageBoardService.returnPlatformAvatar(tenantId, tenantType); + return AjaxResult.success(avatarAddress); + } + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index d03e5152..73aae832 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -45,5 +45,16 @@ public interface XhpcMessageBoardService { */ QueryUserMassageResponse queryUserMessage(UserQueryCondition userQueryCondition); + /** + * 根据租户id和租户类型查询指定的租户头像 + * + * @param tenantId 租户id + * @param tenantType 租户类型 + * @return 头像地址 + * @author WH + * @date 2022/1/13 18:30 + * @since version-1.0 + */ + String returnPlatformAvatar(String tenantId, Integer tenantType); } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 57d1f8c0..51a78d6c 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -225,4 +225,20 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { return response; } + /** + * 根据租户id和租户类型查询指定的租户头像 + * + * @param tenantId 租户id + * @param tenantType 租户类型 + * @return 头像地址 + * @author WH + * @date 2022/1/13 18:30 + * @since version-1.0 + */ + @Override + public String returnPlatformAvatar(String tenantId, Integer tenantType) { + + return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; + } + } From 07aa17ec4a047955c40aa936161e889dd03823ae Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 18:59:55 +0800 Subject: [PATCH 45/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=9A=84Bug?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=B7=B2=E4=BD=BF=E5=8F=8C=E6=96=B9=E4=BB=BB?= =?UTF-8?q?=E6=84=8F=E4=B8=80=E6=96=B9=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E4=BC=9A=E4=BD=BF=E5=BE=97Redis=E4=B8=AD?= =?UTF-8?q?=E7=9A=84key=E7=9A=84=E6=9C=89=E6=95=88=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/board/controller/XhpcMessageBoardController.java | 7 +++++++ .../board/service/impl/XhpcMessageBoardServiceImpl.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java index 24c2b409..51afa483 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -24,6 +24,13 @@ public class XhpcMessageBoardController { @Resource XhpcMessageBoardService xhpcMessageBoardService; + /** + * 平台给用户发送消息 + * + * @author WH + * @date 2022/1/13 18:43 + * @since version-1.0 + */ @PostMapping("/platform/message") public AjaxResult platformSendMessageToUser(@RequestBody PlatformSendMessageToUserRequest platformRequest) { diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 51a78d6c..88e0d033 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -133,13 +133,13 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { String platformRedisKey = "PlatformMessageValidTime:" + "0:" + sysUser.getTenantId() + ":" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount(); Object cacheObject = redisService.getCacheObject(platformRedisKey); String currentTime; + String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); if (cacheObject == null) { //设置当前时间 currentTime = DateUtil.getYyyyMmDdHhMmSs(); redisService.setCacheObject(platformRedisKey, currentTime); redisService.expire(platformRedisKey, 60 * 5); //设置用户RedisKey的有效时间，保证双方时间数据同步 - String userRedisKey = "userMessageValidTime:" + platformRequest.getSenderType() + ":" + platformRequest.getSenderAccount() + ":" + "0:" + sysUser.getTenantId(); redisService.setCacheObject(userRedisKey, currentTime); redisService.expire(userRedisKey, 60 * 5); platformRequest.setSendMessageTime(currentTime); @@ -150,10 +150,12 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { } //reset redis key valid time redisService.expire(platformRedisKey, 60 * 5); + redisService.expire(userRedisKey, 60 * 5); platformRequest.setSendMessageTime((String) cacheObject); platformRequest.setTenantId(sysUser.getTenantId()); platformRequest.setTenantType(0); messageBoardMapper.insertPlatformMessage(platformRequest); + } /** @@ -237,7 +239,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { */ @Override public String returnPlatformAvatar(String tenantId, Integer tenantType) { - + //todo 查询数据库 return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; } From 1f98095a07b0beb228250235899945b7475b963e Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 13 Jan 2022 19:21:17 +0800 Subject: [PATCH 46/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AFredisKey=E6=9C=89=E6=95=88=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 88e0d033..91d0686d 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -61,13 +61,13 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { //使用Redis判断消息发送是否大于5分钟： Object cacheObject = redisService.getCacheObject(userRedisKey); String currentTime; + String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); if (cacheObject == null) { //设置当前时间 currentTime = DateUtil.getYyyyMmDdHhMmSs(); redisService.setCacheObject(userRedisKey, currentTime); redisService.expire(userRedisKey, 60 * 5); //设置平台RedisKey的有效时间，保证双方时间数据同步 - String platformRedisKey = "PlatformMessageValidTime:" + userMessage.getTenantType() + ":" + userMessage.getTenantId() + ":" + loginUser.getUserType() + ":" + loginUser.getUsername(); redisService.setCacheObject(platformRedisKey, currentTime); redisService.expire(platformRedisKey, 60 * 5); userMessage.setSendMessageTime(currentTime); @@ -92,6 +92,7 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { } else { //reset redis key valid time redisService.expire(userRedisKey, 60 * 5); + redisService.expire(platformRedisKey, 60 * 5); currentTime = (String) cacheObject; userMessage.setSendMessageTime(currentTime); //设置用户账号，用户类型 From 8dca6064aaa12db448c7d3650daeb785db9f1776 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Fri, 14 Jan 2022 15:47:25 +0800 Subject: [PATCH 47/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9gitignore=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=83=AD?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6=20=E4=BF=AE=E6=94=B9token?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA600=20=E6=B7=BB=E5=8A=A0javaBean?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BE=9D=E8=B5=96=20=E5=A2=9E=E5=8A=A0slf4j?= =?UTF-8?q?=E6=97=A5=E5=BF=97debug=20=E6=90=AD=E5=A5=BD=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=A1=86?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + pom.xml | 7 +++ .../com/xhpc/gateway/filter/AuthFilter.java | 2 +- .../com/xhpc/XhpcMessageBoardApplication.java | 4 +- .../XhpcMessageBoardController.java | 25 ++++++-- .../board/domain/QueryUserListRequest.java | 60 +++++++++++++++++++ .../board/domain/QueryUserListResponse.java | 44 ++++++++++++++ .../service/XhpcMessageBoardService.java | 17 ++++-- .../impl/XhpcMessageBoardServiceImpl.java | 20 +++++-- 9 files changed, 165 insertions(+), 15 deletions(-) create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java create mode 100644 xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java diff --git a/.gitignore b/.gitignore index 4916f7a2..b10eb207 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ target/ *.iws *.iml *.ipr +rebel.xml ### NetBeans ### nbproject/private/ diff --git a/pom.xml b/pom.xml index 9d913dd0..bf139940 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ + + + javax.validation + validation-api + 2.0.1.Final + + org.springframework.cloud diff --git a/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java index 69394c89..8f9d1a46 100644 --- a/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/xhpc/gateway/filter/AuthFilter.java @@ -37,7 +37,7 @@ public class AuthFilter implements GlobalFilter, Ordered { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); - private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60; + private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 600; // 排除过滤的 uri 地址，nacos自行添加 @Autowired diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java index 36f0e453..e3264ebc 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java @@ -1,11 +1,11 @@ package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; -import com.xhpc.common.security.annotation.EnableRyFeignClients; import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author WH @@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @EnableCustomConfig @EnableCustomSwagger2 -@EnableRyFeignClients +@EnableFeignClients @SpringBootApplication @MapperScan("com.xhpc.board.mapper") public class XhpcMessageBoardApplication { diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java index 51afa483..d22962d2 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java @@ -1,12 +1,12 @@ package com.xhpc.board.controller; import com.xhpc.board.domain.PlatformSendMessageToUserRequest; +import com.xhpc.board.domain.QueryUserListRequest; +import com.xhpc.board.domain.QueryUserListResponse; import com.xhpc.board.service.XhpcMessageBoardService; import com.xhpc.common.core.web.domain.AjaxResult; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -19,6 +19,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/board") +@Slf4j public class XhpcMessageBoardController { @Resource @@ -39,4 +40,20 @@ public class XhpcMessageBoardController { return AjaxResult.success(); } + /** + * 租户查询给它发送信息的用户的列表 + * + * @author WH + * @date 2022/1/14 10:26 + * @since version-1.0 + */ + @GetMapping("/user/list") + public AjaxResult queryUserList(QueryUserListRequest param) { + + QueryUserListResponse queryUserListResponse = xhpcMessageBoardService.queryUserList(param); + + return AjaxResult.success(queryUserListResponse); + + } + } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java new file mode 100644 index 00000000..2e250e6f --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java @@ -0,0 +1,60 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 查询给租户发信息的用户的列表 + * + * @author WH + * @date 2022/1/14 11:17 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class QueryUserListRequest { + + /** + * senderAccount + */ + @JsonProperty("senderAccount") + private String senderAccount; + /** + * userType + */ + @JsonProperty("userType") + private Integer userType; + /** + * currentPage + */ + @JsonProperty("currentPage") + @NotNull(message = "currentPage的参数名不正确或者currentPage的值为空，检查传入参数") + @NotBlank(message = "currentPage的参数为''字符串，请检查传入参数") + private Integer currentPage; + /** + * items + */ + @JsonProperty("items") + @NotNull(message = "items的参数名不正确或者items的值为空，检查传入参数") + @NotBlank(message = "items的参数为''字符串，请检查传入参数") + private Integer items; + /** + * tenantId + */ + @JsonProperty("tenantId") + @NotNull(message = "tenantId的参数名不正确或者tenantId的值为空，检查传入参数") + @NotBlank(message = "tenantId的参数为''字符串，请检查传入参数") + private String tenantId; + /** + * tenantType + */ + @JsonProperty("tenantType") + @NotNull(message = "tenantType的参数名不正确或者tenantType的值为空，检查传入参数") + @NotBlank(message = "tenantType的参数为''字符串，请检查传入参数") + private Integer tenantType; + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java new file mode 100644 index 00000000..5191b53e --- /dev/null +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java @@ -0,0 +1,44 @@ +package com.xhpc.board.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 封装查询用户列表的包装类对象 + * + * @author WH + * @date 2022/1/14 11:23 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class QueryUserListResponse { + + @JsonProperty("totalItems") + private Long totalItems; + @JsonProperty("data") + private List data; + + @NoArgsConstructor + @Data + public static class DataDTO { + + @JsonProperty("userIcon") + private String userIcon; + @JsonProperty("userAccount") + private String userAccount; + @JsonProperty("userType") + private Integer userType; + @JsonProperty("haveNewInfo") + private Integer haveNewInfo; + @JsonProperty("tenantId") + private String tenantId; + @JsonProperty("tenantType") + private Integer tenantType; + + } + +} diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java index 73aae832..ab3f12cb 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java @@ -1,9 +1,6 @@ package com.xhpc.board.service; -import com.xhpc.board.domain.PlatformSendMessageToUserRequest; -import com.xhpc.board.domain.QueryUserMassageResponse; -import com.xhpc.board.domain.SendMessageToPlatformRequest; -import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.domain.*; /** * 留言板服务的Service @@ -57,4 +54,16 @@ public interface XhpcMessageBoardService { */ String returnPlatformAvatar(String tenantId, Integer tenantType); + /** + * 平台用户查询哪些用户发留言了的列表 + * + * @param param query list condition + * @return 发了信息的用户列表 + * @author WH + * @date 2022/1/14 11:25 + * @since version-1.0 + */ + QueryUserListResponse queryUserList(QueryUserListRequest param); + + } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index 91d0686d..bdbdfdaa 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -1,9 +1,6 @@ package com.xhpc.board.service.impl; -import com.xhpc.board.domain.PlatformSendMessageToUserRequest; -import com.xhpc.board.domain.QueryUserMassageResponse; -import com.xhpc.board.domain.SendMessageToPlatformRequest; -import com.xhpc.board.domain.UserQueryCondition; +import com.xhpc.board.domain.*; import com.xhpc.board.mapper.XhpcMessageBoardMapper; import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper; import com.xhpc.board.pojo.XhpcMessageBoard; @@ -244,4 +241,19 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { return "https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"; } + /** + * 平台用户查询哪些用户发留言了的列表 + * + * @param param query list condition + * @return 发了信息的用户列表 + * @author WH + * @date 2022/1/14 11:25 + * @since version-1.0 + */ + @Override + public QueryUserListResponse queryUserList(QueryUserListRequest param) { + + return null; + } + } From 604e01995565e46ed705d31d53f682c0a550f230 Mon Sep 17 00:00:00 2001 From: yuyang Date: Tue, 18 Jan 2022 16:58:12 +0800 Subject: [PATCH 48/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=A0=E5=8A=A0=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=95=99=E8=A8=80=E6=9D=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XhpcInvoiceServiceImpl.java | 2 +- .../order/api/XhpcPileOrderController.java | 2 +- .../XhpcHistoryOrderController.java | 24 +++++++++++++++++++ .../impl/XhpcChargeOrderServiceImpl.java | 23 +++++++++++------- .../impl/XhpcRealTimeOrderServiceImpl.java | 12 ++++++++-- .../mapper/XhpcChargeOrderMapper.xml | 2 +- .../mapper/XhpcHistoryOrderMapper.xml | 2 ++ .../service/impl/XhpcAppUserServiceImpl.java | 14 +++++++++-- 8 files changed, 65 insertions(+), 16 deletions(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index 2528d3e7..6d345f3e 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -260,7 +260,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { public InvoicedOrderResponse findUserHistoryOrders(InvoicedOrdersRequest invoicedOrdersRequest) { //自动生成当前时间 - if (invoicedOrdersRequest.getCurrentTime() == null) { + if (invoicedOrdersRequest.getCurrentTime() == null || "".equals(invoicedOrdersRequest.getCurrentTime())) { Date currentDate = new Date(); String strTime = DateUtils.parseDateToStr(currentDate); invoicedOrdersRequest.setCurrentTime(strTime); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 3e50d7fd..ad2cd3e3 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -383,7 +383,7 @@ public class XhpcPileOrderController extends BaseController { //订单异常 xhpcChargeOrder.setStatus(2); //异常原因 - xhpcChargeOrder.setErroRemark("桩异常：" + stopReason + ">>>>用户id:" + userId + "为空"); + xhpcChargeOrder.setErroRemark("".equals(xhpcChargeOrder.getErroRemark())?"桩异常：" + stopReason + ">>>>用户id:" + userId + "为空":xhpcChargeOrder.getErroRemark()+"桩异常：" + stopReason + ">>>>用户id:" + userId + "为空"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); R.ok(); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index 75aa172f..fc8b02aa 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -888,6 +888,30 @@ public class XhpcHistoryOrderController extends BaseController { } } + @GetMapping("/getManualAudit") + public void getManualAudit(Long chargeOrderId){ + //获取异常的订单 24小时之外的异常订单 + XhpcChargeOrder xhpcChargeOrder = chargeOrderService.getChargingOrderId(chargeOrderId); + if(xhpcChargeOrder !=null){ + Integer source = xhpcChargeOrder.getSource(); + String tenantId = xhpcChargeOrder.getTenantId(); + xhpcChargeOrder.getChargeOrderId(); + if(!UserTypeUtil.INTERNET_TYPE.equals(source)){ + R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); + if(user !=null && user.getData() !=null){ + Map userMessage = (Map)user.getData(); + if (userMessage != null && userMessage.get("balance") != null) { + xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,xhpcChargeOrder.getSerialNumber(),2); + } + } + }else{ + xhpcHistoryOrderService.addXhpcChargeOrder(null,xhpcChargeOrder.getSerialNumber(),2); + } + } + } + + + /** * 标记异常大于创建4小时，标记为异常 * @param diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index b83c85ce..9f5a9567 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -600,19 +600,24 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar List list = xhpcChargeOrderMapper.getFourTimsStatus(); if(list !=null && list.size()>0){ for (XhpcChargeOrder xhpcChargeOrder:list) { - CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + xhpcChargeOrder.getSerialNumber() + ".lord"); Long chargeOrderId = xhpcChargeOrder.getChargeOrderId(); - if(cacheRealtimeData ==null){ - int count = xhpcChargeOrderMapper.getSerialNumberLike(xhpcChargeOrder.getSerialNumber().substring(0, 16), chargeOrderId); - if(count>0){ - //有充电改为 由充电中变为启动充电中 - xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId); + if(UserTypeUtil.INTERNET_TYPE.equals(xhpcChargeOrder.getSource())){ + //标记异常 + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + }else{ + CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + xhpcChargeOrder.getSerialNumber() + ".lord"); + if(cacheRealtimeData ==null){ + int count = xhpcChargeOrderMapper.getSerialNumberLike(xhpcChargeOrder.getSerialNumber().substring(0, 16), chargeOrderId); + if(count>0){ + //有充电改为 由充电中变为启动充电中 + xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId); + }else{ + //标记异常 + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + } }else{ - //标记异常 xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); } - }else{ - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); } } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 08114514..680219a6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -160,6 +160,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe //获取该订单最后一条实时数据 Map cacheMap = redisService.getCacheMap("order:" + chargeOrder.getSerialNumber()); List list = (List) cacheMap.get("realtimeDataList"); + CacheRealtimeData startData =new CacheRealtimeData(); CacheRealtimeData endData =new CacheRealtimeData(); @@ -175,7 +176,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe Long rateModelId = chargeOrder.getRateModelId(); - if(endData !=null && endData.getAmountCharged() !=null){ + if(endData !=null && endData.getAmountCharged() !=null && startData.getChargingTime()>0){ message.put("soc",endData.getSoc()); //最后一祯时间 @@ -220,6 +221,12 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe chargeOrder.setChargingTime(endRealTimeOrder.getChargingTime()); message.put("chargingTime",endRealTimeOrder.getChargingTime()); + if(chargeOrder.getStartTime().equals(chargeOrder.getEndTime())){ + message.put("powerPriceTotal",0); + message.put("servicePriceTotal",0); + return AjaxResult.success(message); + } + chargeOrder.setStartTime(startTime); chargeOrder.setEndTime(endTime); chargeOrder.setStartSoc(startRealTimeOrder.getSoc()); @@ -233,6 +240,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe chargeOrder.setChargingDegree(chargingDegree); chargeOrder.setType(0); chargeOrder.setAmountCharged(endRealTimeOrder.getAmountCharged()); + } Date startTime2 = chargeOrder.getStartTime(); @@ -307,7 +315,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe //订单异常 xhpcChargeOrder.setStatus(2); //异常原因 - xhpcChargeOrder.setErroRemark("用户id:" + userId + "为空"); + xhpcChargeOrder.setErroRemark("".equals(xhpcChargeOrder.getErroRemark())?"用户id:" + userId + "为空":xhpcChargeOrder.getErroRemark()+"用户id:" + userId + "为空"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); return AjaxResult.error("用户id:" + userId + "为空"); } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 1e7e293f..64ece5ca 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -644,7 +644,7 @@ from xhpc_terminal as xt left join xhpc_charging_pile as xcp on xcp.serial_number = substring(#{serialNumber}, 1, 14) left join xhpc_charging_station as cs on xt.charging_station_id = cs.charging_station_id - where xt.serial_number = #{serialNumber} + where xt.serial_number = #{serialNumber} and xt.del_falg = 0 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 fb4efb79..ba772080 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -18,6 +18,7 @@ update_by as 'updateBy' from xhpc_device_message where type=#{type} and serial_number=#{serialNumber} + order by create_time desc From 37f45722c132f0898e7bb59e004f389f13567a7b Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 10:53:34 +0800 Subject: [PATCH 51/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=8A=A5=E6=96=87=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/server/HBCheckTask.java | 1 - 1 file changed, 1 deletion(-) 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 f371b1c9..887cd00e 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 @@ -44,7 +44,6 @@ public class HBCheckTask { 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); From 5f120ec4635a8896020c5358baa978ad8af84114 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 11:05:37 +0800 Subject: [PATCH 52/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A9=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xhpc/log/controller/PileLogController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2894c7e2..9ab9f8bb 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 @@ -45,7 +45,7 @@ public class PileLogController extends BaseController { return getDataTable(pileLogService.getPileRunLogPage(pileId)); } - @GetMapping("/export") + @PostMapping("/export") public void export(HttpServletResponse response, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, From 41c1d97624d6b08eae13371073d1422a4b49b9ca Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 13:04:40 +0800 Subject: [PATCH 53/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A9=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/log/controller/PileLogController.java | 10 ++++++++-- .../xhpc/log/mapper/XhpcDeviceMessageMapper.java | 4 +++- .../java/com/xhpc/log/service/PileLogService.java | 2 +- .../xhpc/log/service/impl/PileLogServiceImpl.java | 7 +++---- .../resources/mapper/XhpcDeviceMessageMapper.xml | 15 ++++++++++++++- 5 files changed, 29 insertions(+), 9 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 9ab9f8bb..7351eb23 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 @@ -40,15 +40,19 @@ public class PileLogController extends BaseController { @GetMapping("/detail") - public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId) { + public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime) { startPage(); - return getDataTable(pileLogService.getPileRunLogPage(pileId)); + return getDataTable(pileLogService.getPileRunLogPage(pileId, startTime, endTime)); } @PostMapping("/export") public void export(HttpServletResponse response, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime, @RequestParam(required = false) String serialNumber) throws Exception { Map params = new HashMap<>(); @@ -57,6 +61,8 @@ public class PileLogController extends BaseController { params.put("type", StationDeviceEnum.PILE.getCode()); params.put("serialNumber", serialNumber); params.put("tenantId", tenantId); + params.put("startTime", startTime); + params.put("endTime", endTime); pileLogService.export(response, params); } 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 7f6dda18..ab805788 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 @@ -11,7 +11,9 @@ import java.util.Map; public interface XhpcDeviceMessageMapper { List> selectListByTypeAndSerialNumber(@Param("type") String type, - @Param("serialNumber")String serialNumber); + @Param("serialNumber")String serialNumber, + @Param("startTime") String startTime, + @Param("endTime") String endTime); List> selectListByParams(@Param("params")Map params); 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 b57710b9..4243d1e4 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 @@ -10,7 +10,7 @@ public interface PileLogService { List> getPilePage(Map params); - List> getPileRunLogPage(String pileId); + List> getPileRunLogPage(String pileId, String startTime, String endTime); void export(HttpServletResponse response, Map params) throws Exception; } 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 0b817f6f..70387e76 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 @@ -33,8 +33,8 @@ public class PileLogServiceImpl implements PileLogService { @Override - public List> getPileRunLogPage(String pileId){ - return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); + public List> getPileRunLogPage(String pileId, String startTime, String endTime){ + return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId, startTime, endTime); } @Override @@ -45,11 +45,10 @@ public class PileLogServiceImpl implements PileLogService { writer.addHeaderAlias("chargingStationName", "场站名称"); writer.addHeaderAlias("chargingPileName", "充电桩名称"); writer.addHeaderAlias("serialNumber", "桩编码"); - writer.addHeaderAlias("brandModel", "费率"); + writer.addHeaderAlias("brandModel", "规则型号"); writer.addHeaderAlias("pileType", "电桩类型"); writer.addHeaderAlias("power", "电桩功率(KW)"); writer.addHeaderAlias("content", "充电桩上传平台报文"); - writer.addHeaderAlias("replyContent", "平台回复报文"); writer.addHeaderAlias("remark", "备注描述"); writer.addHeaderAlias("createTime", "发送时间"); 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 ba772080..cd1a96ae 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -18,6 +18,12 @@ update_by as 'updateBy' from xhpc_device_message where type=#{type} and serial_number=#{serialNumber} + + and create_time = ]]> #{startTime} + + + and create_time #{endTime} + order by create_time desc @@ -39,7 +45,7 @@ m.remark as 'remark', m.create_time as 'createTime', m.create_by as 'createBy', - m.update_time as 'updateTime', + m.update_time as 'updateTime' from xhpc_device_message m left join xhpc_charging_pile cp on cp.serial_number=m.serial_number left join xhpc_charging_station st on st.charging_station_id =cp.charging_station_id @@ -62,6 +68,13 @@ and m.charge_order_no=#{params.chargeOrderNo} + + and m.create_time = ]]> #{params.startTime} + + + and m.create_time #{params.endTime} + + order by m.create_time desc From 510510109b0a13af601741178a8981e184d6c7b3 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 16:20:33 +0800 Subject: [PATCH 54/55] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/OrderLogController.java | 8 ++- .../log/controller/PileLogController.java | 2 + .../log/mapper/XhpcDeviceMessageMapper.java | 7 ++ .../log/service/impl/OrderLogServiceImpl.java | 8 ++- .../mapper/XhpcDeviceMessageMapper.xml | 67 +++++++++++++++++++ 5 files changed, 86 insertions(+), 6 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 d36403e1..5050d522 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 @@ -37,15 +37,16 @@ public class OrderLogController extends BaseController { } - @GetMapping("/{orderId}") - public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){ + @GetMapping("/detail") + public TableDataInfo getOrderDetailPage(@RequestParam("orderId") String orderId){ startPage(); return getDataTable(orderLogService.getOrderDetailPage(orderId)); } - @GetMapping("/export") + @PostMapping("/export") public void export(HttpServletResponse response, + @RequestParam(required = false) String orderId, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, @RequestParam(required = false) String serialNumber) throws Exception { @@ -55,6 +56,7 @@ public class OrderLogController extends BaseController { params.put("number", number); params.put("serialNumber", serialNumber); params.put("tenantId", tenantId); + params.put("orderId", orderId); 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 7351eb23..62c8da67 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 @@ -49,6 +49,7 @@ public class PileLogController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, + @RequestParam("pileId") String pileId, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, @RequestParam(required = false) String startTime, @@ -63,6 +64,7 @@ public class PileLogController extends BaseController { params.put("tenantId", tenantId); params.put("startTime", startTime); params.put("endTime", endTime); + params.put("pileId", pileId); pileLogService.export(response, params); } 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 ab805788..c9f267ad 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 @@ -17,4 +17,11 @@ public interface XhpcDeviceMessageMapper { List> selectListByParams(@Param("params")Map params); + + + List> selectListByChargeOrderNo(@Param("chargeOrderNo") String chargeOrderNo); + + + + List> getOrderMessageByParams(@Param("params")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 015256f4..e67291d5 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 @@ -4,6 +4,7 @@ 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.XhpcDeviceMessageMapper; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; @@ -21,8 +22,9 @@ public class OrderLogServiceImpl implements OrderLogService { @Resource XhpcHistoryOrderMapper historyOrderMapper; + @Resource - XhpcMessageMapper messageMapper; + XhpcDeviceMessageMapper deviceMessageMapper; @Override @@ -33,13 +35,13 @@ public class OrderLogServiceImpl implements OrderLogService { @Override public List> getOrderDetailPage(String orderId){ - return messageMapper.getOrderMessagePage(orderId); + return deviceMessageMapper.selectListByChargeOrderNo(orderId); } @Override public void export(HttpServletResponse response, Map params) throws Exception{ - List> list = messageMapper.getOrderMessageByParams(params); + List> list = deviceMessageMapper.getOrderMessageByParams(params); ExcelWriter writer = ExcelUtil.getWriter(true); writer.addHeaderAlias("serialNumber", "订单号"); 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 cd1a96ae..18b1c9f6 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -28,6 +28,26 @@ + + + + + + + From 566fe4461389715e8a72e96d360915dd39876d5f Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 19 Jan 2022 17:30:35 +0800 Subject: [PATCH 55/55] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 5 ++++ .../java/com/xhpc/common/api/CardService.java | 26 +++++++++++++++++++ .../api/factory/CardFallbackFactory.java | 24 +++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardService.java create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/ServiceNameConstants.java index 46038d44..01530427 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/ServiceNameConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/ServiceNameConstants.java @@ -54,4 +54,9 @@ public class ServiceNameConstants { */ public static final String XHPC_PAYMENT = "xhpc-payment"; + /** + * 卡服务 + */ + public static final String XHPC_CARD ="xhpc-card"; + } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardService.java new file mode 100644 index 00000000..176e3d33 --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardService.java @@ -0,0 +1,26 @@ +package com.xhpc.common.api; + +import com.xhpc.common.api.factory.CardFallbackFactory; +import com.xhpc.common.core.constant.ServiceNameConstants; +import com.xhpc.common.core.domain.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 卡订单 + * @author yuyang + * @date 2022/1/19 16:56 + */ +@FeignClient(contextId ="cardService",value = ServiceNameConstants.XHPC_CARD, fallbackFactory = CardFallbackFactory.class) +public interface CardService { + + /** + * 卡启动判断接口 + * @param cardNumber 卡号 + * @param serialNumber 终端编码 + * @return + */ + @GetMapping("/card/cardStartup") + R cardStartup(@RequestParam(value = "cardNumber") String cardNumber, @RequestParam(value = "serialNumber") String serialNumber); +} diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java new file mode 100644 index 00000000..99821d5b --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java @@ -0,0 +1,24 @@ +package com.xhpc.common.api.factory; + +import com.xhpc.common.api.CardService; +import com.xhpc.common.core.domain.R; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * @author yuyang + * @date 2022/1/19 17:18 + */ +@Component +public class CardFallbackFactory implements FallbackFactory { + + @Override + public CardService create(Throwable cause) { + return new CardService() { + @Override + public R cardStartup(String cardNumber, String serialNumber) { + return R.fail("卡启动判断接口失败:" + cause.getMessage()); + } + }; + } +}