From b63707ab7754ac0508d05fb4097f39565afe8b45 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Thu, 18 Nov 2021 16:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BB=8A=E6=97=A5=E5=BA=A6=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8F=B7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysRoleController.java  |  2 +-
 .../system/controller/SysUserController.java  |  2 +-
 .../station/mapper/XhpcTerminalMapper.java    |  2 +-
 .../service/XhpcTerminalServiceImpl.java      |  3 +--
 .../resources/mapper/XhpcTerminalMapper.xml   | 21 +++++++++----------
 xhpc-modules/xhpc-common/pom.xml              |  6 ++++++
 .../java/com/xhpc/common/util/DateUtil.java   |  5 ++---
 .../user/controller/XhpcUserController.java   |  2 +-
 .../main/resources/mapper/XhpcUserMapper.xml  |  6 +-----
 9 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysRoleController.java
index 0ebe4846..24832a01 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysRoleController.java
@@ -90,7 +90,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
-    @PreAuthorize(hasPermi = "system:role:edit")
+    //@PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role)
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 d3de72c4..a7eeae16 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
@@ -196,7 +196,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize(hasPermi = "system:user:edit")
+    //@PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java
index f99f011d..ab02d535 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java
@@ -74,7 +74,7 @@ public interface XhpcTerminalMapper {
     /**
      * 今日充电量、今日充电用户、今日充电次数
      */
-    Map<String, Object> getXhpcRateTimeOrderStatistics(@Param("chargingStationId") Long chargingStationId, @Param("gunNumber") String gunNumber);
+    Map<String, Object> getXhpcRateTimeOrderStatistics(@Param("chargingStationId") Long chargingStationId, @Param("terminalId")Long terminalId);
 
     /**
      * 通过终端编号进入小程序开始充电页面
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
index c9d5edb4..355052fa 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
@@ -87,14 +87,13 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService {
         Map<String, Object> map = xhpcTerminalMapper.selectXhpcTerminalPileMessage(terminalId);
         if (map != null && map.get("chargingStationId") != null && map.get("serialNumber") != null) {
             Long chargingStationId = Long.parseLong(map.get("chargingStationId").toString());
-            String gunNumber = map.get("serialNumber").toString().substring(14);
             //费率时段,先反设置时段，在反默认时段
             List<Map<String, Object>> xhpcRateTimeTypeList = xhpcTerminalMapper.getXhpcRateTimeTypeList(chargingStationId, 1);
             xhpcRateTimeTypeList.addAll(xhpcTerminalMapper.getXhpcRateTimeTypeList(chargingStationId, 2));
             map.put("rateTimeList", xhpcRateTimeTypeList);
 
             //统计终端（充redis获取终端信息）
-            map.putAll(xhpcTerminalMapper.getXhpcRateTimeOrderStatistics(chargingStationId, gunNumber));
+            map.putAll(xhpcTerminalMapper.getXhpcRateTimeOrderStatistics(chargingStationId, terminalId));
 
             if(map.get("chargingDegreeSum")==null || map.get("chargingDegreeSum").toString()==null || "".equals(map.get("chargingDegreeSum").toString())){
                 map.put("chargingDegreeSum",0);
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
index 75045e95..f779b179 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
@@ -312,17 +312,16 @@
     </select>
 
     <select id="getXhpcRateTimeOrderStatistics" resultType="map">
-        select IFNULL(sum(charging_degree), '0') AS chargingDegreeSum,
-               COUNT(real_time_order_id)         as realTimeOrderIdCount,
-               COUNT(DISTINCT user_id)           as userIdCount
-        from xhpc_real_time_order
-        where real_time_order_id in (
-            select max(real_time_order_id)
-            from xhpc_real_time_order
-            WHERE to_days(create_time) = to_days(now())
-              and charging_station_id = #{chargingStationId}
-              and gun_number = #{gunNumber}
-            group by charging_order_id)
+        SELECT
+            sum(charging_degree) AS chargingDegreeSum,
+            COUNT(charge_order_id) AS realTimeOrderIdCount,
+            COUNT(DISTINCT user_id) AS userIdCount
+        FROM
+            xhpc_charge_order
+        WHERE
+            terminal_id = #{terminalId}
+        and charging_station_id=#{chargingStationId}
+        AND to_days(create_time) = to_days(now())
     </select>
 
     <select id="getWXpNumMessage" resultType="map">
diff --git a/xhpc-modules/xhpc-common/pom.xml b/xhpc-modules/xhpc-common/pom.xml
index ffaa0595..f2f8e5cb 100644
--- a/xhpc-modules/xhpc-common/pom.xml
+++ b/xhpc-modules/xhpc-common/pom.xml
@@ -57,5 +57,11 @@
             <version>4.6.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.9</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/DateUtil.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/DateUtil.java
index 18652f0b..03392750 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/DateUtil.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/DateUtil.java
@@ -1,5 +1,7 @@
 package com.xhpc.common.util;
 
+
+
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 
@@ -153,7 +155,6 @@ public class DateUtil {
      * java.text.SimpleDateFormat
      *
      * @param date
-     * @param format
      * @return
      */
     public static final String date2ChineseString(Date date) {
@@ -247,8 +248,6 @@ public class DateUtil {
      * beginDate before c2, negative if beginDate after endDate, 0 if beginDate
      * and endDate represent the same day.
      *
-     * @param beginDate the begin date
-     * @param endDate   the end date
      * @return natural days between begin date and end date
      */
 
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 38a8b554..500de840 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
@@ -147,7 +147,7 @@ public class XhpcUserController extends BaseController {
         Long[] roles = new Long[1];
         roles[0] = role.getRoleId();
         sysUser.setRoleIds(roles);
-        sysUser.setPassword(sysUser.getUserName());
+        sysUser.setPassword("123456");
         iXhpcUserService.insertUser(sysUser);
         return AjaxResult.success();
     }
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
index 2d1ba6b2..d981d2fe 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
@@ -105,11 +105,7 @@
         CASE WHEN su.`status` = 0 THEN '正常' else '禁用' end statusName
         from sys_user su
         LEFT JOIN xhpc_operator xo on xo.operator_id = su.operator_id
-        WHERE su.del_flag = 0
-
-        <if test="userrType!='00'">
-            and su.user_type = '01'
-        </if>
+        WHERE su.del_flag = 0 and user_type = '03'
         <if test="userName != null and userName != ''">
             and su.user_name like concat(concat('%', #{userName}), '%')
         </if>