From dfa9ac7043919e0b703ae265706d2ad4a7875b2e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 02 一月 2024 17:02:03 +0800 Subject: [PATCH] #修改命令记录日志 --- src/main/java/com/zy/asrs/controller/TaskWrkController.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 00a2fbf..1fad82c 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -16,6 +16,8 @@ import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; +import com.zy.asrs.utils.SaasUtils; +import com.zy.asrs.utils.Utils; import com.zy.common.utils.HttpHandler; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; @@ -23,6 +25,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.*; @RestController @@ -90,7 +94,7 @@ @RequestMapping(value = "/taskWrk/updatePoint/auth") @ManagerAuth - public R updatePoint(TaskWrk taskWrk){ + public R updatePoint(TaskWrk taskWrk) throws UnknownHostException { if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) { return R.error(); } @@ -98,10 +102,25 @@ if (taskWrk1 == null) { return R.error(); } + InetAddress localHost = InetAddress.getLocalHost(); + String ipAddress = localHost.getHostAddress(); + + SaasUtils.insertLog(1,taskWrk1.getStartPoint()+"-"+taskWrk1.getTargetPoint(),taskWrk.getStartPoint()+"-"+taskWrk.getTargetPoint(), ipAddress,getUser().getUsername()); + + taskWrk1.setStartPoint(taskWrk.getStartPoint()); taskWrk1.setTargetPoint(taskWrk.getTargetPoint()); + if (taskWrk1.getIoType() == 1){ + taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint())); + } else if (taskWrk1.getIoType() == 2) { + taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint())); + } else if (taskWrk1.getIoType() == 3) { + taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint())); + taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint())); + } taskWrk1.setModiTime(new Date()); taskWrk1.setModiUser(getUserId()); + taskWrkService.updateById(taskWrk1); return R.ok(); } -- Gitblit v1.9.1