From cd50316e1b7c5a26aad6cd1f90ffd1fb751c0395 Mon Sep 17 00:00:00 2001 From: Wtd <1658714322@qq.com> Date: Tue, 21 Nov 2023 08:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=85=E9=9A=9C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fault/domain/req/FaultQueryReq.java | 19 ------------------- february-fault-server/pom.xml | 5 +---- .../fault/controller/FaultController.java | 6 +++--- .../february/fault/mapper/FaultMapper.java | 2 +- .../february/fault/service/FaultService.java | 2 +- .../fault/service/impl/FaultServiceImpl.java | 4 ++-- .../resources/mapper/february/FaultMapper.xml | 8 ++++---- 7 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java diff --git a/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java b/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java deleted file mode 100644 index accafa0..0000000 --- a/february-fault-common/src/main/java/com/february/fault/domain/req/FaultQueryReq.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.february.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @program: february-fault-information - * @description: - * @author: Mr.Wang - * @create: 2023-11-20 22:17 - **/ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class FaultQueryReq { -} diff --git a/february-fault-server/pom.xml b/february-fault-server/pom.xml index 7ef553d..08cb46a 100644 --- a/february-fault-server/pom.xml +++ b/february-fault-server/pom.xml @@ -25,10 +25,7 @@ mybatis-plus-join 1.2.4 - - com.february - february-common-core - + com.february february-fault-remote diff --git a/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java b/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java index 777f10f..e65fca1 100644 --- a/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java +++ b/february-fault-server/src/main/java/com/february/fault/controller/FaultController.java @@ -1,6 +1,7 @@ package com.february.fault.controller; -import com.february.common.core.web.page.TableDataInfo; + +import com.february.common.core.domain.Result; import com.february.common.redis.service.RedisService; import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; @@ -8,7 +9,7 @@ import com.february.fault.domain.FaultAlarm; import com.february.fault.domain.FaultRank; import com.february.fault.domain.FaultType; -import com.february.fault.result.Result; + import com.february.fault.service.FaultService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,7 +28,6 @@ public class FaultController { private FaultService faultService; @Autowired private RedisService redisService; - /** * 故障列表 * @return diff --git a/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java b/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java index f7c3404..632e183 100644 --- a/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java +++ b/february-fault-server/src/main/java/com/february/fault/mapper/FaultMapper.java @@ -19,7 +19,7 @@ import java.util.List; **/ @Mapper public interface FaultMapper extends MPJBaseMapper,BaseMapper { - Integer addFault(Fault fault); +// Integer addFault(Fault fault); Integer addFaultAlarm(FaultAlarm faultAlarm); diff --git a/february-fault-server/src/main/java/com/february/fault/service/FaultService.java b/february-fault-server/src/main/java/com/february/fault/service/FaultService.java index 23d8e69..7381541 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/FaultService.java +++ b/february-fault-server/src/main/java/com/february/fault/service/FaultService.java @@ -5,7 +5,7 @@ import com.february.fault.domain.Fault; import com.february.fault.domain.FaultAlarm; import com.february.fault.domain.FaultRank; import com.february.fault.domain.FaultType; -import com.february.fault.result.Result; +import com.february.common.core.domain.Result; import org.springframework.stereotype.Component; import java.util.List; diff --git a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java index 088330d..4155591 100644 --- a/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java +++ b/february-fault-server/src/main/java/com/february/fault/service/impl/FaultServiceImpl.java @@ -9,7 +9,7 @@ import com.february.fault.domain.FaultAlarm; import com.february.fault.domain.FaultRank; import com.february.fault.domain.FaultType; import com.february.fault.mapper.FaultMapper; -import com.february.fault.result.Result; +import com.february.common.core.domain.Result; import com.february.fault.service.FaultService; import com.february.fault.utils.StringUtils; import com.github.yulichang.base.MPJBaseMapper; @@ -55,7 +55,7 @@ public class FaultServiceImpl extends ServiceImpl implements @Override public Result addFault(Fault fault) { - Integer i=faultMapper.addFault(fault); + Integer i=faultMapper.insert(fault); if(i>0){ return Result.success("添加成功"); } diff --git a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml index a3e13eb..c272c08 100644 --- a/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml +++ b/february-fault-server/src/main/resources/mapper/february/FaultMapper.xml @@ -1,10 +1,10 @@ - - INSERT INTO `car`.`t_fault` ( `fault_bh`, `fault_name`, `fault_type_id`, `car_id`, `actuate_id`, `fault_detail`, `fault_rank_id`, `is_alarm`, `respond_style`, `is_create`) - VALUES ( #{faultBh}, #{faultName}, #{faultTypeId}, #{carId}, #{actuateId}, #{faultDetail}, #{faultRankId}, #{isAlarm}, #{respondStyle}, #{isCreate}) - + + + + INSERT INTO `car`.`t_fault_alarm` ( `car_bh`, `car_vin`, `fault_alarm_type`, `fault_name`, `fault_bh`, `response_level`, `alarm_state`, `hand_style`, `alarm_start_time`, `alarm_near_time`, `alarm_end_time`, `admin_id`, `fault_processor`, `process_time`, `fault_alarm_state`) VALUES ( #{carBh}, #{carVin}, #{faultAlarmType}, #{faultName}, #{faultBh}, #{responseLevel}, #{alarmState}, #{handStyle}, #{alarmStartTime}, #{alarmNearTime}, #{alarmEndTime}, #{adminId}, #{faultProcessor}, #{processTime}, #{faultAlarmState})