更新桩运行日志的查询条件

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<String, Object> 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);
     }
 

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

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/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/XhpcDeviceMessageMapper.xml

@@ -18,6 +18,12 @@
             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>
 
@@ -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 @@
         <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>