From 4efdfa79008cb12e1fbb7120cd68198cd0d0677c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十二月 2023 16:47:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 44dd2aa..15f2a53 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -1,15 +1,22 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.entity.CommandInfoLog;
 import com.zy.asrs.mapper.CommandInfoMapper;
 import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoLogService;
 import com.zy.asrs.service.CommandInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service("commandInfoService")
 public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {
+
+    @Autowired
+    private CommandInfoLogService commandInfoLogService;
 
     @Override
     public List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo) {
@@ -20,4 +27,42 @@
     public List<CommandInfo> selectByWrkNo(Integer wrkNo) {
         return this.baseMapper.selectByWrkNo(wrkNo);
     }
+
+    @Override
+    public List<CommandInfo> selectByTaskNo(String taskNo) {
+        return this.baseMapper.selectByTaskNo(taskNo);
+    }
+
+    @Override
+    public int saveToHistory(String taskNo) {
+        int count = 0;
+        if (this.selectByTaskNo(taskNo).isEmpty()) {
+            return count;
+        }
+        for (CommandInfo commandInfo : this.baseMapper.selectByTaskNo(taskNo)) {
+            String jsonString = JSON.toJSONString(commandInfo);
+            CommandInfoLog commandInfoLog = JSON.parseObject(jsonString, CommandInfoLog.class);
+            commandInfoLog.setId(null);
+            if (commandInfoLogService.insert(commandInfoLog)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public boolean saveToHistory(Integer id) {
+        CommandInfo commandInfo = this.baseMapper.selectById(id);
+        String jsonString = JSON.toJSONString(commandInfo);
+        CommandInfoLog commandInfoLog = JSON.parseObject(jsonString, CommandInfoLog.class);
+        commandInfoLog.setId(null);
+        boolean result1 = commandInfoLogService.insert(commandInfoLog);
+        Integer result2 = this.baseMapper.deleteById(id);
+        return result1 && result2 > 0;
+    }
+
+    @Override
+    public List<CommandInfo> selectCompleteManualCommand() {
+        return this.baseMapper.selectCompleteManualCommand();
+    }
 }

--
Gitblit v1.9.1