Merge remote-tracking branch 'origin/master'

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java

@@ -37,15 +37,16 @@ public class OrderLogController extends BaseController {
     }
 
 
-    @GetMapping("/{orderId}")
+    @GetMapping("/detail")
-    public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){
+    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);
     }
 

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java

@@ -40,15 +40,20 @@ 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));
     }
 
-    @GetMapping("/export")
+    @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,
+                       @RequestParam(required = false) String endTime,
                         @RequestParam(required = false) String serialNumber) throws Exception {
 
         Map<String, Object> params = new HashMap<>();
@@ -57,6 +62,9 @@ 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);
+        params.put("pileId", pileId);
         pileLogService.export(response, params);
     }
 

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java

@@ -11,8 +11,17 @@ import java.util.Map;
 public interface XhpcDeviceMessageMapper {
 
     List<Map<String, Object>> selectListByTypeAndSerialNumber(@Param("type") String type,
-                                                              @Param("serialNumber")String serialNumber);
+                                                              @Param("serialNumber")String serialNumber,
+                                                                @Param("startTime") String startTime,
+                                                              @Param("endTime") String endTime);
 
 
     List<Map<String, Object>> selectListByParams(@Param("params")Map params);
+
+
+    List<Map<String, Object>> selectListByChargeOrderNo(@Param("chargeOrderNo") String chargeOrderNo);
+
+
+
+    List<Map<String, Object>> getOrderMessageByParams(@Param("params")Map params);
 }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java

@@ -10,7 +10,7 @@ public interface PileLogService {
     List<Map<String, Object>> getPilePage(Map<String, Object> params);
 
 
-    List<Map<String, Object>> getPileRunLogPage(String pileId);
+    List<Map<String, Object>> getPileRunLogPage(String pileId, String startTime, String endTime);
 
     void export(HttpServletResponse response, Map<String, Object> params) throws Exception;
 }

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<Map<String, Object>> getOrderDetailPage(String orderId){
-        return messageMapper.getOrderMessagePage(orderId);
+        return deviceMessageMapper.selectListByChargeOrderNo(orderId);
     }
 
 
     @Override
     public void export(HttpServletResponse response, Map<String, Object> params) throws Exception{
-        List<Map<String, Object>> list = messageMapper.getOrderMessageByParams(params);
+        List<Map<String, Object>> list = deviceMessageMapper.getOrderMessageByParams(params);
 
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("serialNumber", "订单号");

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<Map<String, Object>> getPileRunLogPage(String pileId){
+    public List<Map<String, Object>> getPileRunLogPage(String pileId, String startTime, String endTime){
-        return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId);
+        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", "发送时间");
 

xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 oper_name = #{params.operName}
             </if>
         </where>
+        order by oper_time desc
     </select>
 
 </mapper>

xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml

@@ -18,6 +18,33 @@
             update_by as 'updateBy'
         from xhpc_device_message
         where type=#{type} and serial_number=#{serialNumber}
+        <if test="startTime !=null and startTime!=''">
+            and create_time <![CDATA[ >=  ]]> #{startTime}
+        </if>
+        <if test="endTime !=null and endTime!=''">
+            and create_time <![CDATA[ <=  ]]> #{endTime}
+        </if>
+        order by create_time desc
+    </select>
+
+
+
+    <select id="selectListByChargeOrderNo" resultType="map">
+        select
+        device_message_id as 'deviceMessageId',
+        type as 'type',
+        serial_number as 'serialNumber',
+        content as 'content',
+        charge_order_no as 'chargeOrderNo',
+        status as 'status',
+        remark as 'remark',
+        create_time as 'createTime',
+        create_by as 'createBy',
+        update_time as 'updateTime',
+        update_by as 'updateBy'
+        from xhpc_device_message
+        where charge_order_no=#{chargeOrderNo}
+        order by create_time desc
     </select>
 
 
@@ -38,7 +65,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
@@ -52,6 +79,9 @@
         <if test="params.type!=null and params.type!=''">
             and m.type=#{params.type}
         </if>
+        <if test="params.pileId!=null and params.pileId!=''">
+            and m.serial_number=#{params.pileId}
+        </if>
         <if test="params.tenantId != null and params.tenantId != ''">
             and cp.tenant_id = #{params.tenantId}
         </if>
@@ -61,7 +91,58 @@
         <if test="params.chargeOrderNo !=null and params.chargeOrderNo!=''">
             and m.charge_order_no=#{params.chargeOrderNo}
         </if>
+        <if test="params.startTime !=null and params.startTime!=''">
+            and m.create_time <![CDATA[ >=  ]]> #{params.startTime}
+        </if>
+        <if test="params.endTime !=null and params.endTime!=''">
+            and m.create_time <![CDATA[ <=  ]]> #{params.endTime}
+        </if>
+        order by m.create_time desc
 
     </select>
 
+
+    <select id="getOrderMessageByParams" resultType="java.util.Map">
+        select
+        co.serial_number as 'serialNumber',
+        co.source as 'source',
+        case co.source when 0 then 'C端用户'
+        when 1 then '流量方用户'
+        when 2 then '社区用户'
+        when 3 then 'B端用户' end as 'sourceName',
+        co.start_time as 'startTime',
+        co.end_time as 'endTime',
+        co.charging_degree as 'chargingDegree',
+        co.amount_charged as 'amountCharged',
+        co.charging_time as 'chargingTime',
+        co.start_soc as 'startSOc',
+        co.end_soc as 'endSoc',
+        m.device_message_id as 'messageId',
+        m.charge_order_no as 'chargeOrderNo',
+        m.content as 'content',
+        m.status as 'status',
+        m.remark as 'remark',
+        m.create_time as 'createTime'
+        from xhpc_device_message m
+        LEFT JOIN xhpc_charge_order as co on co.serial_number = m.charge_order_no
+        left join xhpc_charging_station as st on st.charging_station_id = co.charging_station_id
+        where co.del_flag =0
+        <if test="params.number !=0 and params.number ==1">
+            and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
+        </if>
+        <if test="params.number !=0 and params.number ==2">
+            and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId})
+        </if>
+        <if test="params.tenantId != null and params.tenantId != ''">
+            and co.tenant_id = #{params.tenantId}
+        </if>
+        <if test="params.serialNumber !=null and params.serialNumber !=''">
+            and co.serial_number=#{params.serialNumber}
+        </if>
+        <if test="params.orderId !=null and params.orderId !=''">
+            and m.charge_order_no=#{params.orderId}
+        </if>
+        order by m.charge_order_no asc, m.create_time asc
+    </select>
+
 </mapper>

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);