From 034d356972e1c497bc7fe8a2b234ee5444d141cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 12:16:21 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/breakdown/controller/SysCarFaultController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java index a8c8b6c..9a3cd30 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java @@ -78,6 +78,7 @@ public class SysCarFaultController extends BaseController return toAjax(sysCarFaultService.save(sysCarFault)); } + /** * 修改车辆故障管理 */ From 347f5c35201bb346182b684236bd847b315165a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 18:43:08 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/wechat/controller/WxTestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WxTestController.java b/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WxTestController.java index bfce459..1332c2a 100644 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WxTestController.java +++ b/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WxTestController.java @@ -81,7 +81,7 @@ public class WxTestController { // message.setMsgType(map.get("MsgType")); message.setMsgType("text"); message.setCreateTime(System.currentTimeMillis() / 1000); - message.setContent("自动回复:您好"); + message.setContent("官方回复:您好"); //XStream将java对象转换为xml字符串 XStream xStream = new XStream(); xStream.processAnnotations(Message.class); From 4686fc17fe618da678185c3c656082b821676206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 18:44:19 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- cloud-gateway/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-breakdown/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-file/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-gen/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-system/src/main/resources/bootstrap.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 38c7f2a..a0515a2 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index cf1cc9f..de95a70 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml index 9ce45cb..a7f2757 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index cb7e8d5..3a1eb6a 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 0b7bdc1..c5e8cb9 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index 566c624..afe1a22 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: From bf235658fb9a2fe9ccfffba14277e1a04046a976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 19:51:02 +0800 Subject: [PATCH 04/23] =?UTF-8?q?feat:=E6=98=AF=E5=90=A6=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCarFaultController.java | 26 +++++++++++++++++++ .../muyu/breakdown/domain/SysCarFault.java | 4 +-- .../breakdown/service/SysCarFaultService.java | 2 ++ .../service/impl/SysCarFaultServiceImpl.java | 2 ++ .../mapper/breakdown/SysCarFaultMapper.xml | 7 +++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java index 9a3cd30..922842b 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java @@ -1,5 +1,7 @@ package com.muyu.breakdown.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.service.SysCarFaultService; import com.muyu.common.core.domain.Result; @@ -104,4 +106,28 @@ public class SysCarFaultController extends BaseController sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); return success(); } + + /** + * 启用告警 + * @param id + */ + @PutMapping("/enableWarningsById/{id}") + public void enableWarningsById(@PathVariable("id")Long id){ + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("id",id); + wrapper.set("warn_status",0); + sysCarFaultService.update(wrapper); + } + /** + * 禁用告警 + * @param id + */ + @PutMapping("/disableWarningsById/{id}") + public void disableWarningsById(@PathVariable("id")Long id){ + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("id",id); + wrapper.set("warn_status",1); + sysCarFaultService.update(wrapper); + } + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java index 7abee76..47b6b9f 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java @@ -80,11 +80,11 @@ public class SysCarFault extends BaseEntity{ /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") - private Long status; + private Integer status; /** 是否警告(0.开启 1.禁止) */ @Excel(name = "是否警告(0.开启 1.禁止)") - private Long warnStatus; + private Integer warnStatus; diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java index 604c27d..0251a0a 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java @@ -35,4 +35,6 @@ public interface SysCarFaultService extends IService { */ Boolean checkIdUnique(SysCarFault sysCarFault); + + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java index 717933a..3c44426 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java @@ -72,4 +72,6 @@ public class SysCarFaultServiceImpl return this.count(queryWrapper) > 0; } + + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml index 4b3f17d..b2e564c 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml @@ -127,4 +127,11 @@ #{id} + + + update sys_car_fault set warn_status = 0 where id = #{id} + + + update sys_car_fault set warn_status = 1 where id = #{id} + From 737d6bffaa12506dc4abcde4cd45f0cbab47552c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 20:31:23 +0800 Subject: [PATCH 05/23] =?UTF-8?q?chore:=E4=BF=AE=E6=94=B9=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/breakdown/domain/SysCarFault.java | 5 +--- .../breakdown/domain/SysCarFaultType.java | 24 ------------------- .../mapper/breakdown/SysCarFaultMapper.xml | 6 +---- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java index 47b6b9f..5c01b54 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java @@ -50,9 +50,7 @@ public class SysCarFault extends BaseEntity{ @Excel(name = "故障标签") private String faultLabel; - /** 故障组 */ - @Excel(name = "故障组") - private String faultGroup; + /** 故障位 */ @Excel(name = "故障位") @@ -97,7 +95,6 @@ public class SysCarFault extends BaseEntity{ .append("typeId", getTypeId()) .append("carVin", getCarVin()) .append("faultLabel", getFaultLabel()) - .append("faultGroup", getFaultGroup()) .append("faultBit", getFaultBit()) .append("faultValue", getFaultValue()) .append("faultRank", getFaultRank()) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java deleted file mode 100644 index cc04b83..0000000 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.breakdown.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - -/** - * @ClassDescription: - * @JdkVersion: 1.8 - * @Author: YZL - * @Created: 2024/9/20 11:34 - */ -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_fault_type") -public class SysCarFaultType { - private Long faultTypeId; - private String faultTypeName; -} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml index b2e564c..6a00694 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml +++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml @@ -11,7 +11,6 @@ - @@ -28,7 +27,7 @@ - select id, fault_code, fault_name, type_id, car_vin, fault_label, fault_group, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault + select id, fault_code, fault_name, type_id, car_vin, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault @@ -50,7 +49,6 @@ fault_code, fault_name, type_id, - car_vin, fault_label, fault_bit, fault_value, @@ -70,7 +68,6 @@ #{faultCode}, #{faultName}, #{typeId}, - #{carVin}, #{faultLabel}, #{faultBit}, #{faultValue}, @@ -94,7 +91,6 @@ fault_code = #{faultCode}, fault_name = #{faultName}, type_id = #{typeId}, - car_vin = #{carVin}, fault_label = #{faultLabel}, fault_bit = #{faultBit}, fault_value = #{faultValue}, From a40653dc4d8094c0a130689f3a08474472fa6274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 22 Sep 2024 16:48:26 +0800 Subject: [PATCH 14/23] =?UTF-8?q?feat:=E7=AB=99=E5=86=85=E4=BF=A1=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCarFaultController.java | 1 - .../SysCarFaultMessageController.java | 48 +++++++++++++++++++ .../breakdown/domain/SysCarFaultMessage.java | 41 ++++++++++++++++ .../mapper/SysCarFaultMessageMapper.java | 24 ++++++++++ .../service/SysCarFaultMessageService.java | 21 ++++++++ .../impl/SysCarFaultMessageServiceImpl.java | 38 +++++++++++++++ 6 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java index e8c3065..72f4d2c 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java @@ -1,6 +1,5 @@ package com.muyu.breakdown.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.breakdown.domain.SysCarFault; import com.muyu.breakdown.service.SysCarFaultService; diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java new file mode 100644 index 0000000..5c15d04 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java @@ -0,0 +1,48 @@ +package com.muyu.breakdown.controller; + +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.service.SysCarFaultMessageService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:39 + */ +@RestController +@RequestMapping("/message") +public class SysCarFaultMessageController extends BaseController { + @Autowired + private SysCarFaultMessageService service; + + @GetMapping("/list") + public Result> list(){ + startPage(); + List list = service.list(); + return getDataTable(list); + } + + @GetMapping("/listStatusOne") + public Result>listStatusOne(){ + startPage(); + List list = service.listStatusOnt(); + return getDataTable(list); + } + + @GetMapping("/listStatusTwo") + public Result>listStatusTwo(){ + startPage(); + List list = service.listStatusTwo(); + return getDataTable(list); + } +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java new file mode 100644 index 0000000..d73baa6 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultMessage.java @@ -0,0 +1,41 @@ +package com.muyu.breakdown.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassDescription: 站内信息对象 sys_car_fault_message + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 11:57 + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_car_fault_message") +public class SysCarFaultMessage extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 内容 */ + private String content; + + /**开始时间 */ + private Date createTime; + + /**是否已读 */ + private Integer status; + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java new file mode 100644 index 0000000..e2ac860 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java @@ -0,0 +1,24 @@ +package com.muyu.breakdown.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 11:59 + */ +@Mapper +public interface SysCarFaultMessageMapper extends BaseMapper { + + @Select("select * from sys_car_fault_message where status=1") + public ListlistStatusOnt( ); + @Select("select * from sys_car_fault_message where status=2") + public ListlistStatusTwo( ); + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java new file mode 100644 index 0000000..fd98eb6 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java @@ -0,0 +1,21 @@ +package com.muyu.breakdown.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.breakdown.domain.SysCarFault; +import com.muyu.breakdown.domain.SysCarFaultMessage; + +import java.util.List; +import java.util.stream.IntStream; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:35 + */ +public interface SysCarFaultMessageService extends IService { + public List selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage); + + public ListlistStatusOnt( ); + public ListlistStatusTwo( ); +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java new file mode 100644 index 0000000..c780aaf --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java @@ -0,0 +1,38 @@ +package com.muyu.breakdown.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.breakdown.domain.SysCarFault; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.mapper.SysCarFaultMessageMapper; +import com.muyu.breakdown.service.SysCarFaultMessageService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 14:36 + */ +@Service +public class SysCarFaultMessageServiceImpl extends ServiceImpl implements SysCarFaultMessageService { + + @Override + public List selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + return baseMapper.selectList(wrapper); + } + + @Override + public List listStatusOnt( ) { + return baseMapper.listStatusOnt(); + } + + @Override + public List listStatusTwo( ) { + return baseMapper.listStatusTwo(); + } +} From 1facc255866b00d54ddf96fc37223c55c2b10838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 22 Sep 2024 21:25:54 +0800 Subject: [PATCH 15/23] =?UTF-8?q?feat:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sysCarFaultLogController.java | 48 +++++++++++++++++++ .../muyu/breakdown/domain/SysCarFaultLog.java | 44 +++++++++++++++++ .../mapper/SysCarFaultLogMapper.java | 25 ++++++++++ .../service/SysCarFaultLogService.java | 20 ++++++++ .../impl/sysCarFaultLogServiceImpl.java | 36 ++++++++++++++ 5 files changed, 173 insertions(+) create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java create mode 100644 cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java new file mode 100644 index 0000000..25c45c6 --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -0,0 +1,48 @@ +package com.muyu.breakdown.controller; + +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.service.SysCarFaultLogService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:08 + */ +@RestController +@RequestMapping("/log") +public class sysCarFaultLogController extends BaseController { + @Autowired + private SysCarFaultLogService service; + + @GetMapping("/list") + public Result> list(){ + startPage(); + List list = service.list(); + return getDataTable(list); + } + + @GetMapping("/listIsReadAlready") + public Result>listIsReadAlready(){ + startPage(); + List list = service.listIsReadAlready(); + return getDataTable(list); + } + + @GetMapping("/listIsReadNoAlready") + public Result>listIsReadNoAlready(){ + startPage(); + List list = service.listIsReadNoAlready(); + return getDataTable(list); + } + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java new file mode 100644 index 0000000..1168a8c --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java @@ -0,0 +1,44 @@ +package com.muyu.breakdown.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 20:17 + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_car_fault_log") +public class SysCarFaultLog extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @TableId( type = IdType.AUTO) + private Long id; + /** 故障码编码 */ + private Integer sysCarFaultId; + /**记录时间*/ + private Date createTime; + + /** 结束时间*/ + private Date updateTime; + + /** 是否已读 */ + private Integer isRead; + + + +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java new file mode 100644 index 0000000..d5354aa --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java @@ -0,0 +1,25 @@ +package com.muyu.breakdown.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:06 + */ +@Mapper +public interface SysCarFaultLogMapper extends BaseMapper { + + + @Select("select * from sys_car_fault_log where is_read=1") + public List listIsReadAlready( ); + @Select("select * from sys_car_fault_log where is_read=2") + public ListlistISReadNotYet( ); +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java new file mode 100644 index 0000000..0c09fbd --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java @@ -0,0 +1,20 @@ +package com.muyu.breakdown.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.domain.SysCarFaultMessage; +import com.muyu.breakdown.domain.SysCarFaultLog; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:07 + */ +public interface SysCarFaultLogService extends IService { + + public List listIsReadAlready( ); + public ListlistIsReadNoAlready( ); +} diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java new file mode 100644 index 0000000..d6f291b --- /dev/null +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -0,0 +1,36 @@ +package com.muyu.breakdown.service.impl; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.domain.SysCarFaultLog; +import com.muyu.breakdown.mapper.SysCarFaultLogMapper; +import com.muyu.breakdown.mapper.SysCarFaultMapper; +import com.muyu.breakdown.service.SysCarFaultLogService; +import com.muyu.breakdown.service.SysCarFaultLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 1.8 + * @Author: YZL + * @Created: 2024/9/22 21:07 + */ +@Service +public class sysCarFaultLogServiceImpl extends ServiceImpl implements SysCarFaultLogService { + + @Autowired + private SysCarFaultLogMapper mapper; + @Override + public List listIsReadAlready() { + return mapper.listIsReadAlready(); + } + + @Override + public List listIsReadNoAlready() { + return mapper.listIsReadAlready(); + } +} From 47a67d40c718d817e0c4754682df94ed3167bd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 22 Sep 2024 22:31:04 +0800 Subject: [PATCH 16/23] =?UTF-8?q?feat:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java index 1168a8c..3532fa5 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java @@ -39,6 +39,8 @@ public class SysCarFaultLog extends BaseEntity { /** 是否已读 */ private Integer isRead; + /** VIN码 */ + private String vin; } From 24f84b74cf1e81734a8dcd982598a8468951f635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 22 Sep 2024 22:34:12 +0800 Subject: [PATCH 17/23] =?UTF-8?q?feat:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../breakdown/controller/sysCarFaultLogController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java index 25c45c6..e97f885 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -7,6 +7,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -45,4 +46,10 @@ public class sysCarFaultLogController extends BaseController { return getDataTable(list); } + @PostMapping("/add") + public Result add(SysCarFaultLog sysCarFaultLog){ + + return toAjax(service.save(sysCarFaultLog)); + } + } From fc78229b0bc412907136c3ee72dfc33e1cbf1923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Sun, 22 Sep 2024 22:37:38 +0800 Subject: [PATCH 18/23] =?UTF-8?q?feat:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../breakdown/controller/sysCarFaultLogController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java index e97f885..9b4a725 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -6,10 +6,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -47,7 +44,7 @@ public class sysCarFaultLogController extends BaseController { } @PostMapping("/add") - public Result add(SysCarFaultLog sysCarFaultLog){ + public Result add(@RequestBody SysCarFaultLog sysCarFaultLog){ return toAjax(service.save(sysCarFaultLog)); } From 2b4111fccd96ef19c4bc893bc015505b72ec6786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 12:02:22 +0800 Subject: [PATCH 19/23] =?UTF-8?q?chore:yml=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=88nacos=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-visual-monitor/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index 9ee8251..817bb35 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: four + namespace: yzl # Spring spring: From c13bf9528c8a92309c3e63d82d528eb00523c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 20:56:10 +0800 Subject: [PATCH 20/23] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sysCarFaultLogController.java | 26 +++++++--- .../muyu/breakdown/domain/SysCarFaultLog.java | 5 +- .../service/SysCarFaultLogService.java | 8 ++- .../impl/sysCarFaultLogServiceImpl.java | 52 +++++++++++++++++-- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java index 9b4a725..2104941 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -23,23 +23,33 @@ public class sysCarFaultLogController extends BaseController { private SysCarFaultLogService service; @GetMapping("/list") - public Result> list(){ + public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.list(); + List list = service.selectSysCarFaultLogList(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listIsReadAlready") - public Result>listIsReadAlready(){ + @GetMapping("/listStatusIgnore") + public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.listIsReadAlready(); + List list = service.listStatusIgnore(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listIsReadNoAlready") - public Result>listIsReadNoAlready(){ + + + + @GetMapping("/listStatusSolve") + public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); - List list = service.listIsReadNoAlready(); + List list = service.listStatusSolve(sysCarFaultLog); + return getDataTable(list); + } + + @GetMapping("/listStatusProcess") + public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ + startPage(); + List list = service.listStatusProcess(sysCarFaultLog); return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java index 3532fa5..c082d61 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java @@ -36,11 +36,12 @@ public class SysCarFaultLog extends BaseEntity { /** 结束时间*/ private Date updateTime; - /** 是否已读 */ - private Integer isRead; /** VIN码 */ private String vin; + /** 处理状态 1-解决 2-处理中 3-忽略 */ + private Integer status; + } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java index 0c09fbd..cf09c18 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java @@ -15,6 +15,10 @@ import java.util.List; */ public interface SysCarFaultLogService extends IService { - public List listIsReadAlready( ); - public ListlistIsReadNoAlready( ); + public ListselectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog); + + public List listStatusIgnore(SysCarFaultLog sysCarFaultLog); + public ListlistStatusProcess(SysCarFaultLog sysCarFaultLog ); + + public ListlistStatusSolve(SysCarFaultLog sysCarFaultLog); } diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java index d6f291b..74b9fc8 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.breakdown.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.breakdown.domain.SysCarFaultLog; @@ -8,6 +9,8 @@ import com.muyu.breakdown.mapper.SysCarFaultLogMapper; import com.muyu.breakdown.mapper.SysCarFaultMapper; import com.muyu.breakdown.service.SysCarFaultLogService; import com.muyu.breakdown.service.SysCarFaultLogService; +import com.muyu.common.core.utils.StringUtils; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,13 +27,54 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl listIsReadAlready() { - return mapper.listIsReadAlready(); + public List selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()!=null){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); } @Override - public List listIsReadNoAlready() { - return mapper.listIsReadAlready(); + public List listStatusIgnore(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==3){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); } + + @Override + public List listStatusProcess(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==2){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); + } + + @Override + public List listStatusSolve(SysCarFaultLog sysCarFaultLog) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ + wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); + } + if (sysCarFaultLog.getStatus()==1){ + wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); + } + return this.list(wrapper); + } + + } From efb50cff22357caddbcfa2cdb3d89a7dc5a4f7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 21:05:45 +0800 Subject: [PATCH 21/23] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java index 74b9fc8..0d3e9b2 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -25,8 +25,7 @@ import java.util.List; @Service public class sysCarFaultLogServiceImpl extends ServiceImpl implements SysCarFaultLogService { - @Autowired - private SysCarFaultLogMapper mapper; + @Override public List selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) { From 08b4d720d836111c5b6e8d9a4bef784f2a1a424d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 21:07:32 +0800 Subject: [PATCH 22/23] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../breakdown/controller/sysCarFaultLogController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java index 2104941..0275a29 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java @@ -22,14 +22,14 @@ public class sysCarFaultLogController extends BaseController { @Autowired private SysCarFaultLogService service; - @GetMapping("/list") + @PostMapping("/list") public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.selectSysCarFaultLogList(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listStatusIgnore") + @PostMapping("/listStatusIgnore") public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusIgnore(sysCarFaultLog); @@ -39,14 +39,14 @@ public class sysCarFaultLogController extends BaseController { - @GetMapping("/listStatusSolve") + @PostMapping("/listStatusSolve") public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusSolve(sysCarFaultLog); return getDataTable(list); } - @GetMapping("/listStatusProcess") + @PostMapping("/listStatusProcess") public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusProcess(sysCarFaultLog); From 1f7dc72f8d3022a1d3a48ee25a7adaf12315d447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Tue, 24 Sep 2024 00:20:27 +0800 Subject: [PATCH 23/23] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/sysCarFaultLogServiceImpl.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java index 0d3e9b2..85c68ea 100644 --- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java @@ -39,39 +39,44 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl listStatusIgnore(SysCarFaultLog sysCarFaultLog) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,3); if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); } - if (sysCarFaultLog.getStatus()==3){ - wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); - } return this.list(wrapper); } + /** + * 只展示处理中的数据 + * @param sysCarFaultLog + * @return + */ @Override public List listStatusProcess(SysCarFaultLog sysCarFaultLog) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,2); if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); } - if (sysCarFaultLog.getStatus()==2){ - wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); - } return this.list(wrapper); } + //只展示已解决的数据 @Override public List listStatusSolve(SysCarFaultLog sysCarFaultLog) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCarFaultLog::getStatus,1); if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){ wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin()); } - if (sysCarFaultLog.getStatus()==1){ - wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus()); - } return this.list(wrapper); }