From 46639b77a0a060ce4879061b91d5a82ef37a53af Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Wed, 10 Apr 2024 20:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BreakLogController.java | 11 +++++++++++ .../java/com/zhilian/business/domain/BreakLog.java | 4 +++- .../com/zhilian/business/mapper/BreakLogMapper.java | 2 ++ .../zhilian/business/service/BreakLogService.java | 2 ++ .../business/service/impl/BreakLogServiceImpl.java | 5 +++++ .../src/main/resources/mapper/BreakLogMapper.xml | 13 +++++++++---- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java index 6de8793..5aac0d8 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java @@ -3,7 +3,9 @@ package com.zhilian.business.controller; import com.zhilian.business.domain.BreakLog; import com.zhilian.business.service.BreakLogService; import com.zhilian.common.core.domain.Result; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -60,4 +62,13 @@ public class BreakLogController { return success; } + @PostMapping("logDel/{breakLogId}") + public Result logDel(@PathVariable Integer breakLogId){ + int del = breakLogService.logDel(breakLogId); + Result success = Result.success(del); + return success; + } + + + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java index 068c39d..ccc22cf 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -25,6 +25,8 @@ public class BreakLog { private String breakTime; /** 开始报警时间 */ private String breakDate; - /** 是否报警 */ + /** 故障状态 */ private String breakState; + /** 逻辑删除 */ + private Integer breakDel; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java index a8c7c7e..c072e45 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java @@ -18,4 +18,6 @@ public interface BreakLogMapper { int logAdd(BreakLog breakLog); int updLog(BreakLog breakLog); + + int logDel(Integer breakLogId); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java index 10792ac..1168a49 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java @@ -16,4 +16,6 @@ public interface BreakLogService { int logAdd(BreakLog breakLog); int updLog(BreakLog breakLog); + + int logDel(Integer breakLogId); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java index f3288a7..0c47c9f 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java @@ -74,4 +74,9 @@ public class BreakLogServiceImpl implements BreakLogService { public int updLog(BreakLog breakLog) { return breakLogMapper.updLog(breakLog); } + + @Override + public int logDel(Integer breakLogId) { + return breakLogMapper.logDel(breakLogId); + } } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml index 82afe6b..a9919c4 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml @@ -6,18 +6,23 @@ INSERT INTO `zhilian-business`.`business_break_log` - ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`) + ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`,`break_del`) VALUES - (#{breakCode}, #{breakVin}, NOW(), #{breakType}, NOW(), #{breakState}); + (#{breakCode}, #{breakVin},#{breakTime}, #{breakType},DATE_ADD(NOW(),INTERVAL 8 HOUR), #{breakState},0); UPDATE `zhilian-business`.`business_break_log` - SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState} + SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState}, `break_del` = #{breakDel} WHERE `break_log_id` = #{breakLogId}; + + UPDATE `zhilian-business`.`business_break_log` + SET break_del = 1 + WHERE break_log_id = #{breakLogId} +