插入充电历史

ruoyi-admin/src/main/java/com/ruoyi/job/charg/mapper/SrgvChargingJobMapper.java

@@ -58,4 +58,9 @@ public interface SrgvChargingJobMapper
      * @return 结果
      */
     public int deleteSrgvChargingJobByGuids(String[] guids);
+    /**
+     * 插入充电任务历史
+     * @param guid
+     */
+    void insertHistory(String guid);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/charg/service/ISrgvChargingJobService.java

@@ -58,4 +58,9 @@ public interface ISrgvChargingJobService
      * @return 结果
      */
     public int deleteSrgvChargingJobByGuid(String guid);
+    /**
+     * 插入充电任务历史
+     * @param guid
+     */
+    void insertHistory(String guid);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/charg/service/impl/SrgvChargingJobServiceImpl.java

@@ -90,4 +90,13 @@ public class SrgvChargingJobServiceImpl implements ISrgvChargingJobService
     {
         return srgvChargingJobMapper.deleteSrgvChargingJobByGuid(guid);
     }
+
+    /**
+     * 插入充电任务历史
+     * @param guid
+     */
+    @Override
+    public void insertHistory(String guid) {
+        srgvChargingJobMapper.insertHistory(guid);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java

@@ -153,6 +153,10 @@ public class CdzThread implements Runnable {
                         srgvChargingJob.setChargingStatus("1");
                         srgvChargingJob.setChargingDate(DateUtil.formatDateTime(DateUtil.date()));
                         chargingJobService.updateSrgvChargingJob(srgvChargingJob);
+
+                        //插入历史
+                        chargingJobService.insertHistory(srgvChargingJob.getGuid());
+                        chargingJobService.deleteSrgvChargingJobByGuid(srgvChargingJob.getGuid());
                     }
                 }
 
@@ -227,7 +231,10 @@ public class CdzThread implements Runnable {
         List<SrgvChargingJob> srgvChargingJobs = chargingJobService.selectSrgvChargingJobList(srgvChargingJobParam);
         if (CollUtil.isNotEmpty(srgvChargingJobs)) {
             SrgvChargingJob scj = srgvChargingJobs.get(0);
-            //scj.setGuid(IdUtil.fastSimpleUUID());
+
+            //插入历史
+            chargingJobService.insertHistory(scj.getGuid());
+
             scj.setChargingSite(cdz.getSiteId());
             scj.setJobStatus("1");
             scj.setChargingStatus("0");

ruoyi-admin/src/main/resources/mapper/job/SrgvChargingJobMapper.xml

@@ -64,6 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chargingId != null">#{chargingId},</if>
          </trim>
     </insert>
+    <insert id="insertHistory">
+        insert into srgv_charging_job_finish
+        select * from srgv_charging_job where guid = #{guid}
+    </insert>
 
     <update id="updateSrgvChargingJob" parameterType="SrgvChargingJob">
         update srgv_charging_job