订单导出增加停止原因,更新停止原因枚举

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml

@@ -59,7 +59,8 @@
     GROUP_CONCAT(d.dept_name) as 'deptName',
     GROUP_CONCAT(u.work_user_id) as 'userId',
     GROUP_CONCAT(u.user_name, '(', d.dept_name, ')') as 'userName',
-    o.`status` as 'status'
+    o.`status` as 'status',
+    o.create_time as createTime
     from xhpc_work_order o
     left join xhpc_work_type_dict td on td.work_type_id=o.type
     LEFT JOIN xhpc_work_order_user ou on o.work_order_id=ou.order_id

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java

@@ -23,6 +23,7 @@ import com.xhpc.order.mapper.XhpcHistoryOrderMapper;
 import com.xhpc.order.service.IXhpcChargeOrderService;
 import com.xhpc.order.service.IXhpcHistoryOrderService;
 import com.xhpc.order.service.IXhpcRealTimeOrderService;
+import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,13 +62,70 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
     private static final Logger logger = LoggerFactory.getLogger(XhpcHistoryOrderServiceImpl.class);
     private static Map<String, String> SM = new HashMap<>();
     static {
-        SM.put("40", "APP 远程停止");
+        SM.put("40", "APP 远程停止(0X40)");
-        SM.put("41", "SOC 达到 100%");
+        SM.put("41", "SOC 达到 100%(0X41)");
-        SM.put("42", "充电电量满足设定条件");
+        SM.put("42", "充电电量满足设定条件(0X42)");
-        SM.put("43", "充电金额满足设定条件");
+        SM.put("43", "充电金额满足设定条件(0X43)");
-        SM.put("44", "充电时间满足设定条件");
+        SM.put("44", "充电时间满足设定条件(0X44)");
-        SM.put("45", "手动停止充电");
+        SM.put("45", "手动停止充电(0X45)");
+        SM.put("4A", "充电桩控制系统故障(需要重启或自动恢复)(0X4A)");
+        SM.put("4B", "控制导引断开(0X4B)");
+        SM.put("4C", "断路器跳位(0X4C)");
+        SM.put("4D", "电表通信中断(0X4D)");
+        SM.put("4E", "余额不足(0X4E)");
+        SM.put("4F", "充电模块故障(0X4F)");
+        SM.put("50", "急停开入(0X50)");
+        SM.put("51", "防雷器异常(0X5)");
+        SM.put("52", "BMS 未就绪(0X52)");
+        SM.put("53", "温度异常(0X53)");
+        SM.put("54", "电池反接故障(0X54)");
+        SM.put("55", "电子锁异常(0X55)");
+        SM.put("56", "合闸失败(0X56)");
+        SM.put("57", "绝缘异常(0X57)");
+        SM.put("59", "接收 BMS 握手报文 BHM 超时(0X59)");
+        SM.put("5A", "接收 BMS 和车辆的辨识报文超时 BRM(0X5A)");
+        SM.put("5B", "接收电池充电参数报文超时 BCP(0X5B)");
+        SM.put("5C", "接收 BMS 完成充电准备报文超时 BRO AA(0X5C)");
+        SM.put("5D", "接收电池充电总状态报文超时 BCS(0X5D)");
+        SM.put("5E", "接收电池充电要求报文超时 BCL(0X5E)");
+        SM.put("5F", "接收电池状态信息报文超时 BSM(0X5F)");
+        SM.put("60", "GB2015 电池在BHM 阶段有电压不允许充电(0X60)");
+        SM.put("61", "GB2015 辨识阶段在 BRO_AA 时候电池实际电压与 BCP 报文电池电压差距大于 5%(0X61)");
+        SM.put("62", "B2015 充电机在预充电阶段从 BRO_AA 变成BRO_00 状态(0X62)");
+        SM.put("63", "接收主机配置报文超时(0X63)");
+        SM.put("64", "充电机未准备就绪,我们没有回 CRO AA，对应老国标(0X64)");
+        SM.put("6A", "系统闭锁(0X6A)");
+        SM.put("6B", "导引断开(0X6B)");
+        SM.put("6C", "断路器跳位(0X6C)");
+        SM.put("6D", "电表通信中断(0X6D)");
+        SM.put("6E", "余额不足(0X6E)");
+        SM.put("6F", "交流保护动作(0X6F)");
+        SM.put("70", "直流保护动作(0X70)");
+        SM.put("71", "充电模块故障(0X71)");
         SM.put("72", "急停按钮停止充电(0X72)");
+        SM.put("73", "防雷器异常(0X73)");
+        SM.put("74", "温度异常(0X74)");
+        SM.put("75", "输出异常(0X75)");
+        SM.put("76", "充电无流(0X76)");
+        SM.put("77", "电子锁异常(0X77)");
+        SM.put("78", "预留(0X78)");
+        SM.put("79", "总充电电压异常(0X79)");
+        SM.put("7A", "总充电电流异常(0X7A)");
+        SM.put("7B", "单体充电电压异常(0X7B)");
+        SM.put("7C", "电池组过温(0X7C)");
+        SM.put("7D", "最高单体充电电压异常(0X7D)");
+        SM.put("7E", "最高电池组过温(0X7E)");
+        SM.put("7F", "BMV 单体充电电压异常(0X7F)");
+        SM.put("80", "BMT 电池组过温(0X80)");
+        SM.put("81", "电池状态异常停止充电(0X81)");
+        SM.put("82", "车辆发报文禁止充电(0X82)");
+        SM.put("83", "充电桩断电(0X83)");
+        SM.put("84", "接收电池充电总状态报文超时(0X84)");
+        SM.put("85", "接收电池充电要求报文超时(0X85)");
+        SM.put("86", "接收电池状态信息报文超时(0X86)");
+        SM.put("87", "接收 BMS 中止充电报文超时(0X87)");
+        SM.put("88", "接收 BMS 充电统计报文超时(0X88)");
+        SM.put("88", "接收对侧 CCS 报文超时(0X89)");
         SM.put("91", "平台结算(0X91)");
     }
 
@@ -277,22 +335,19 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
         //获取登陆用户
         Long logUserId = SecurityUtils.getUserId();
         LoginUser loginUser = tokenService.getLoginUser();
+        SysUser sysUser = loginUser.getSysUser();
+        Long sysUserId = sysUser.getUserId();
 
         //桩的统计、该时段金额
         List<Map<String, Object>> list = new ArrayList<>();
         if (userId != UserTypeUtil.USER_ID) {
-            Map<String, Object> landUser = xhpcHistoryOrderMapper.getLandUser(logUserId);
+                if (UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())) {
-            if (landUser != null) {
+                    Long logOperatorId = sysUser.getOperatorId();
-                if (landUser.get("userType") != null) {
-                    if (UserTypeUtil.SYS_USER_TYPE_ONE.equals(landUser.get("userType").toString())) {
-                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                     //运营商看自己的场站
                     list = xhpcHistoryOrderMapper.getListPage(chargingStationId,chargingPileId,terminalId,phone, transactionNumber, 1, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logOperatorId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult,tenantId,1);
                 } else {
                     //查询赋值的场站
-                        list = xhpcHistoryOrderMapper.getListPage(chargingStationId,chargingPileId,terminalId,phone, transactionNumber, 2, chargingStationName, operatorId, source, beginStartTime, beginEndTime, logUserId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult,tenantId,1);
+                    list = xhpcHistoryOrderMapper.getListPage(chargingStationId,chargingPileId,terminalId,phone, transactionNumber, 2, chargingStationName, operatorId, source, beginStartTime, beginEndTime, sysUserId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult,tenantId,1);
-                    }
-                }
                 }
         } else {
             list = xhpcHistoryOrderMapper.getListPage(chargingStationId,chargingPileId,terminalId,phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId,confirmResult,tenantId,1);
@@ -341,6 +396,9 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
         writer.addHeaderAlias("endTime", "结束充电时间");
         writer.addHeaderAlias("updateTime", "结算时间");
         writer.addHeaderAlias("chargingModeName", "订单来源");
+        writer.addHeaderAlias("stopReasonEvcs", "停止原因");
+
+
 //        writer.addHeaderAlias("plateNum", "电站名称");
 //        writer.addHeaderAlias("disputeOrderStatus", "桩编号");
 

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -683,6 +683,7 @@
           ho.platform_svc_commisssion as platformSvcCommisssion,
           ho.operation_commission as operationCommission,
           ho.operation_svc_commission as operationSvcCommission,
+          ho.stop_reason_evcs as stopReasonEvcs,
           cop.account as communityAccount,
           cup.account as customersAccount,
         case  when co.source=0 then "C端用户"