diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index d8dd0cc..a12570e 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index c9b97fd..0c1fe84 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Custom.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Custom.java new file mode 100644 index 0000000..ca5c4f2 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Custom.java @@ -0,0 +1,30 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：Custom + * @Description TODO + * @Date：2024/9/21 19:15 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "custom") +public class Custom { + @TableId(value = "c_id", type = IdType.AUTO) + private Integer cId; + @Excel(name = "值") + private String customName; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Fault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Fault.java new file mode 100644 index 0000000..caab1d6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Fault.java @@ -0,0 +1,92 @@ +package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel.ColumnType; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：Fault + * @Description TODO + * @Date：2024/9/18 11:04 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "fault") +public class Fault extends BaseEntity { + + /** + * 自增主键 + */ + @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) + @TableId( type = IdType.AUTO) + private Long id; + /** + * 车辆故障编码 + */ + @Excel(name = "车辆故障编码") + private String faultCode; + /** + * 车辆故障名称 + */ + @Excel(name = "车辆故障名称") + private String faultName; + /** + * 车辆故障类型 + */ + @Excel(name = "辆故障类型") + private String faultType; + /** + * 故障VIN编码 + */ + @Excel(name = "故障VIN编码") + private String carVin; + /** + * 车辆故障标签 + */ + @Excel(name = "车辆故障标签") + private String faultLabel; + /** + * 车辆故障位 + */ + @Excel(name = "车辆故障位") + private String faultBit; + /** + * 车辆故障值 + */ + @Excel(name = "车辆故障值") + private String faultValue; + /** + * 故障级别 + */ + @Excel(name = "故障级别") + private String faultWarn; + /** + * 报警状态（Y.是，N.否） + */ + @Excel(name = "报警状态（Y.是，N.否）") + private String warnStatus; + /** + * 故障描述信息 + */ + @Excel(name = "故障描述信息") + private String faultDesc; + /** + * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) + */ + @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") + private String state; + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultConstant.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultConstant.java new file mode 100644 index 0000000..ee58603 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultConstant.java @@ -0,0 +1,21 @@ +package com.muyu.domain; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：FaultConstant + * @Description TODO + * @Date：2024/9/19 14:33 + */ +public class FaultConstant { + /** + * 故障信息存储 + */ + public static final String FAULT_INFO_PREFIX = "fault:"; + + /** + * 故障信息集合 + */ + public static final String FAULT_LIST = "fault_list"; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultInfo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultInfo.java new file mode 100644 index 0000000..36953cb --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultInfo.java @@ -0,0 +1,77 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain.vo + * @Filename：FaultInfo + * @Description TODO + * @Date：2024/9/16 20:23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "fault_info", autoResultMap = true) +public class FaultInfo extends BaseEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 故障码 + */ + @Excel(name = "故障码") + private String faultCode; + + /** + * 故障类型 + */ + @Excel(name = "故障类型") + private String faultType; + + /** + * 故障组 + */ + @Excel(name = "故障组") + private String groupName; + + /** + * 故障位 + */ + @Excel(name = "故障位") + private Integer faultBit; + + /** + * 故障值 + */ + @Excel(name = "故障值") + private String faultValue; + + /** + * 故障标签 + */ + @Excel(name = "故障标签") + private String faultTab; + + /** + * 是否警告 + */ + @Excel(name = "是否警告") + private Long isWarning; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java new file mode 100644 index 0000000..f730100 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -0,0 +1,67 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：FaultLog + * @Description TODO + * @Date：2024/9/16 20:11 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "fault_log", autoResultMap = true) +public class FaultLog{ + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 故障码 + */ + @Excel(name = "故障码") + private String faultCode; + + /** + * 车辆VIN + */ + @Excel(name = "车辆VIN") + private String vin; + + /** + * 开始报警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:dd:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:dd:ss") + private Date warningTime; + + /** + * 结束报警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:dd:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "结束报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:dd:ss") + private Date normalTime; + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Rule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Rule.java new file mode 100644 index 0000000..e8557f7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Rule.java @@ -0,0 +1,45 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：Custom + * @Description TODO + * @Date：2024/9/21 18:39 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "rule") +public class Rule { + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Excel(name = "messageId") + private Long messageId; + + @Excel(name = "carId") + private Integer carId; + + @Excel(name = "cId") + private Integer cId; + + @Excel(name = "tId") + private Integer tId; + + @Excel(name = "ruleValue") + private Integer ruleValue; + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Type.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Type.java new file mode 100644 index 0000000..51bf7ab --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Type.java @@ -0,0 +1,28 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：Type + * @Description TODO + * @Date：2024/9/22 10:03 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "type") +public class Type { + @TableId(value = "t_id", type = IdType.AUTO) + private Integer tId; + private String typeName; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/RuleVo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/RuleVo.java new file mode 100644 index 0000000..165a570 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/RuleVo.java @@ -0,0 +1,58 @@ +package com.muyu.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.domain + * @Filename：Custom + * @Description TODO + * @Date：2024/9/21 18:39 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "rule") +public class RuleVo { + + @Excel(name = "id") + private Long id; + + @Excel(name = "比较类型") + private Integer cId; + + + @Excel(name = "messageId") + private Long messageId; + + @Excel(name = "标签") + private String messageLabel; + + + @Excel(name = "车辆id") + private Integer carId; + + @Excel(name = "车辆故障类型id") + private Integer tId; + + @Excel(name = "参数值") + private Integer ruleValue; + + @Excel(name = "标准") + private String customName; + + @Excel(name = "故障类型name") + private String typeName; + + @Excel(name = "车辆类型name") + private String carName; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index 839a9f2..27e500d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -11,6 +11,7 @@ cloud-modules-enterprise-server 3.6.3 + cloud-modules-enterprise-server 企业业务平台 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java new file mode 100644 index 0000000..339b885 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java @@ -0,0 +1,110 @@ +package com.muyu.enterprise.controller; +import com.muyu.enterprise.service.FaultService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.domain.Fault; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.controller + * @Filename：FaultController + * @Description TODO + * @Date：2024/9/17 11:08 + */ + +@Log4j2 +@RestController +@Tag(name = "故障管理列", description = "故障管理列") +@RequestMapping("/fault") +public class FaultController extends BaseController { + + @Autowired + private FaultService faultService; + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/list") + @RequiresPermissions("fault:fault:list") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> list(Fault fault) { + startPage(); + List list = faultService.pageQuery(fault); + return getDataTable(list); + } + + /** + * 导出车辆故障管理列表 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @RequiresPermissions("fault:fault:export") + public void export(HttpServletResponse response, Fault fault) { + List list = faultService.pageQuery(fault); + ExcelUtil util = new ExcelUtil(Fault.class); + util.exportExcel(response, list, "车辆故障管理数据"); + } + + /** + * 获取车辆故障管理详细信息 + */ + @GetMapping(value = "/{id}") + public Result getConfigKey (@PathVariable("id") String id) { + return success(faultService.getById(id)); + } + + + /** + * 新增车辆故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.INSERT) + @PostMapping + @RequiresPermissions("fault:fault:add") + public Result add(@RequestBody Fault fault) { + faultService.save(fault); + return Result.success(null,"成功"); + } + + + + /** + * 修改车故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.UPDATE) + @PutMapping + @RequiresPermissions("fault:fault:edit") + public Result edit(@RequestBody Fault fault) { + faultService.updateById(fault); + return Result.success(null,"成功"); + } + + + + /** + * 删除车辆故障管理 + */ + @Log(title = "车辆故障管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + @RequiresPermissions("fault:fault:remove") + public Result remove(@PathVariable("id") Long[] id) { + return Result.success(faultService.removeBatchByIds(Arrays.asList(id)), "成功"); + } + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java new file mode 100644 index 0000000..a0b8860 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java @@ -0,0 +1,114 @@ +package com.muyu.enterprise.controller; + +import com.muyu.enterprise.service.FaultInfoService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.domain.FaultInfo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.controller + * @Filename：FaultController + * @Description TODO + * @Date：2024/9/17 11:08 + */ + +@Log4j2 +@RestController +@Tag(name = "故障管理列", description = "故障管理列") +@RequestMapping("/info") +public class FaultInfoController extends BaseController { + + @Autowired + private FaultInfoService service; + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/list") + @RequiresPermissions("fault:fault:list") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> list(FaultInfo faultInfo) { + startPage(); + List list = service.pageQuery(faultInfo); + return getDataTable(list); + } + + + /** + * 导出车辆故障管理列表 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @RequiresPermissions("fault:fault:export") + public void export(HttpServletResponse response, FaultInfo fault) { + List list = service.pageQuery(fault); + ExcelUtil util = new ExcelUtil(FaultInfo.class); + util.exportExcel(response, list, "车辆故障管理数据"); + } + + + /** + * 获取车辆故障管理详细信息 + */ + @GetMapping(value = "/{id}") + public Result getConfigKey (@PathVariable("id") String id) { + return success(service.getById(id)); + } + + + /** + * 新增车辆故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.INSERT) + @PostMapping + @RequiresPermissions("fault:info:add") + public Result add(@RequestBody FaultInfo fault) { + service.save(fault); + return Result.success(null, "成功"); + } + + + + /** + * 修改车故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.UPDATE) + @PutMapping + @RequiresPermissions("fault:info:edit") + public Result edit(@RequestBody FaultInfo fault) { + service.updateById(fault); + return Result.success(null, "成功"); + } + + + + /** + * 删除车辆故障管理 + */ + @Log(title = "车辆故障管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + @RequiresPermissions("fault:info:remove") + public Result remove(@PathVariable("id") Long[] id) { + return Result.success(service.removeBatchByIds(Arrays.asList(id)), "成功"); + } + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java new file mode 100644 index 0000000..717e9a3 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -0,0 +1,126 @@ +package com.muyu.enterprise.controller; + + +import com.muyu.enterprise.service.FaultLogService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.domain.FaultLog; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.muyu.common.log.annotation.Log; + +import java.util.Arrays; +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.controller + * @Filename：FaultLogController + * @Description TODO + * @Date：2024/9/16 20:20 + */ +@RestController +@RequestMapping("/log") +public class FaultLogController extends BaseController { + @Autowired + private FaultLogService faultLogService; + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/list") + @RequiresPermissions("fault:log:list") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> list(FaultLog fault) { + startPage(); + List list = faultLogService.pageQuery(fault); + return getDataTable(list); + } + + + /** + * 导出车辆故障管理列表 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @RequiresPermissions("fault:log:export") + public void export(HttpServletResponse response, FaultLog fault) { + List list = faultLogService.pageQuery(fault); + ExcelUtil util = new ExcelUtil(FaultLog.class); + util.exportExcel(response, list, "车辆故障管理数据"); + } + + + /** + * 获取车辆故障管理详细信息 + */ + @GetMapping(value = "/{id}") + public Result getConfigKey (@PathVariable("id") String id) { + return success(faultLogService.getById(id)); + } + + + /** + * 新增车辆故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.INSERT) + @PostMapping + @RequiresPermissions("fault:log:add") + public Result add(@RequestBody FaultLog fault) { + faultLogService.save(fault); + return Result.success(null, "成功"); + } + + + + /** + * 修改车故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.UPDATE) + @PutMapping + @RequiresPermissions("fault:log:edit") + public Result edit(@RequestBody FaultLog fault) { + faultLogService.updateById(fault); + return Result.success(null, "成功"); + } + + + + /** + * 删除车辆故障管理 + */ + @Log(title = "车辆故障管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + @RequiresPermissions("fault:log:remove") + public Result remove(@PathVariable("id") Long[] id) { + return Result.success(faultLogService.removeBatchByIds(Arrays.asList(id)), "成功"); + } + + + /** + * 新增故障日志 + */ + @PostMapping("/addLog") + public Result addLog(@RequestBody FaultLog log){ + faultLogService.insertFaultLog(log); + return Result.success(); + } + + /** + * 修改结束时间 + */ + @PostMapping("/updateLog") + public Result updateLog(@RequestBody FaultLog log){ + faultLogService.updateFaultLogByStatus(log); + return Result.success(); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java new file mode 100644 index 0000000..bb8c77f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java @@ -0,0 +1,147 @@ +package com.muyu.enterprise.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.domain.*; +import com.muyu.domain.vo.RuleVo; +import com.muyu.enterprise.service.RuleService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.controller + * @Filename：RuleController + * @Description TODO + * @Date：2024/9/21 18:42 + */ +@Log4j2 +@RestController +@Tag(name = "规则", description = "故障管理列") +@RequestMapping("/rules") +public class RuleController extends BaseController { + + @Autowired + private RuleService ruleService; + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/list") + @RequiresPermissions("fault:rules:list") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> list(RuleVo fault) { + startPage(); + List list = ruleService.pageQueryRule(fault); + return getDataTable(list); + } + + /** + * 导出车辆故障管理列表 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @RequiresPermissions("fault:rules:export") + public void export(HttpServletResponse response, Rule fault) { + List list = ruleService.pageQuery(fault); + ExcelUtil util = new ExcelUtil(Rule.class); + util.exportExcel(response, list, "车辆故障管理数据"); + } + + + /** + * 获取车辆故障管理详细信息 + */ + @GetMapping(value = "/{id}") + public Result getConfigKey(@PathVariable("id") String id) { + return success(ruleService.getById(id)); + } + + + /** + * 新增车辆故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.INSERT) + @PostMapping + @RequiresPermissions("fault:rules:add") + public Result add(@RequestBody Rule fault) { + return Result.success(ruleService.insertFault(fault), "成功"); + } + + + /** + * 修改车故障管理 + */ + @Log(title = "车辆故障管理", businessType = BusinessType.UPDATE) + @PutMapping + @RequiresPermissions("fault:rules:edit") + public Result edit(@RequestBody Rule fault) { + return Result.success(ruleService.updateFault(fault), "成功"); + } + + + /** + * 删除车辆故障管理 + */ + @Log(title = "车辆故障管理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + @RequiresPermissions("fault:rules:remove") + public Result remove(@PathVariable("id") Long[] id) { + return Result.success(ruleService.removeBatchByIds(Arrays.asList(id)), "成功"); + } + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/custom") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> custom(Custom fault) { + return ruleService.pageQueryList(fault); + } + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/car") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> car(Vehicle fault) { + return ruleService.pageQueryCar(fault); + } + + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/type") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> type(Type fault) { + return ruleService.pageQueryType(fault); + } + + /** + * 查询车辆故障管理列表 + */ + @GetMapping("/MessageValue") + @Operation(summary = "查询集合", description = "查询车辆故障管理列表") + public Result> MessageValue(MessageValue fault) { + return ruleService.pageQueryMessageValue(fault); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultInfoMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultInfoMapper.java new file mode 100644 index 0000000..167c89d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultInfoMapper.java @@ -0,0 +1,24 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.muyu.domain.FaultInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.mapper + * @Filename：FaultInfoMapper + * @Description TODO + * @Date：2024/9/19 22:19 + */ +@Mapper +public interface FaultInfoMapper extends BaseMapper { + + int insertFaultinfo(FaultInfo faultInfo); + + + int updateFaultinfo(FaultInfo faultInfo); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java new file mode 100644 index 0000000..52b1d3a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java @@ -0,0 +1,30 @@ +package com.muyu.enterprise.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.FaultLog; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.mapper + * @Filename：FaultLogMapper + * @Description TODO + * @Date：2024/9/16 21:15 + */ +@Mapper +public interface FaultLogMapper extends BaseMapper { + + Long selectFaultId(FaultLog log); + + + int updateFaultLogByTime(FaultLog log); + + + void insertBatchFaultLog(@Param("logs") List logs); +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMapper.java new file mode 100644 index 0000000..4541e7e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMapper.java @@ -0,0 +1,20 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.Fault; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.mapper + * @Filename：FaultMapper + * @Description TODO + * @Date：2024/9/18 11:16 + */ +@Mapper +public interface FaultMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/RuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/RuleMapper.java new file mode 100644 index 0000000..ebd96e4 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/RuleMapper.java @@ -0,0 +1,35 @@ +package com.muyu.enterprise.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.*; +import com.muyu.domain.vo.RuleVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.mapper + * @Filename：RuleMapper + * @Description TODO + * @Date：2024/9/21 18:50 + */ +@Mapper +public interface RuleMapper extends BaseMapper { + int insertFault(Rule faultInfo); + + int updateFault(Rule faultInfo); + + + List pageQueryRule(RuleVo fault); + + List pageQueryList(Custom fault); + + List pageQueryCar(Vehicle fault); + List pageQueryType(Type fault); + + List pageQueryMessageValue(MessageValue fault); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultInfoService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultInfoService.java new file mode 100644 index 0000000..bb0e47f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultInfoService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.service; + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.FaultInfo; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：IFaultInfoService + * @Description TODO + * @Date：2024/9/19 22:15 + */ +public interface FaultInfoService extends IService { + + /** + * 查询车辆故障管理 + * + * @param faultInfo 车辆故障管理主键 + * @return 车辆故障管理 + */ + List pageQuery(FaultInfo faultInfo); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java new file mode 100644 index 0000000..07b1304 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -0,0 +1,34 @@ +package com.muyu.enterprise.service; + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.FaultLog; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：IFaultLogService + * @Description TODO + * @Date：2024/9/16 20:26 + */ +public interface FaultLogService extends IService { + + /** + * + * @param fault + * @return + */ + List pageQuery(FaultLog fault); + + + public int insertFaultLog(FaultLog log); + + + public int updateFaultLogByStatus(FaultLog log); + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultService.java new file mode 100644 index 0000000..bfeb93a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.service; + +; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.Fault; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：IFaultService + * @Description TODO + * @Date：2024/9/18 11:12 + */ +public interface FaultService extends IService { + + /** + * 查询车辆故障管理 + * + * @param fault 车辆故障管理主键 + * @return 车辆故障管理 + */ + List pageQuery(Fault fault); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/RuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/RuleService.java new file mode 100644 index 0000000..221e690 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/RuleService.java @@ -0,0 +1,52 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.*; +import com.muyu.domain.vo.RuleVo; + + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：RuleService + * @Description TODO + * @Date：2024/9/21 18:47 + */ +public interface RuleService extends IService { + /** + * 查询车辆故障管理 + * + * @param fault 车辆故障管理主键 + * @return 车辆故障管理 + */ + List pageQuery(Rule fault); + List pageQueryRule(RuleVo fault); + /** + * 新增车辆故障管理 + * + * @param fault 车辆故障管理 + * @return 结果 + */ + public int insertFault(Rule fault); + + /** + * 修改车辆故障管理 + * + * @param fault 车辆故障管理 + * @return 结果 + */ + public int updateFault(Rule fault); + + Result> pageQueryList(Custom fault); + + Result> pageQueryCar(Vehicle fault); + Result> pageQueryType(Type fault); + + + Result> pageQueryMessageValue(MessageValue fault); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultInfoServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultInfoServiceImpl.java new file mode 100644 index 0000000..d792289 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultInfoServiceImpl.java @@ -0,0 +1,49 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; + +import com.muyu.domain.FaultInfo; +import com.muyu.enterprise.mapper.FaultInfoMapper; +import com.muyu.enterprise.service.FaultInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service.impl + * @Filename：IFaultInfoServiceImpl + * @Description TODO + * @Date：2024/9/19 22:16 + */ +@Service +public class FaultInfoServiceImpl extends ServiceImpl implements FaultInfoService { + + @Autowired + private FaultInfoMapper faultInfoMapper; + + /** + * + * @param faultInfo 车辆故障管理主键 + * @return fault + */ + @Override + public List pageQuery(FaultInfo faultInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultInfo.getFaultCode())) { + queryWrapper.like(FaultInfo::getFaultCode, faultInfo.getFaultCode()); + } + if (StringUtils.isNotEmpty(faultInfo.getFaultType())) { + queryWrapper.like(FaultInfo::getFaultType, faultInfo.getFaultType()); + } + if (StringUtils.isNotEmpty(faultInfo.getGroupName())) { + queryWrapper.like(FaultInfo::getGroupName, faultInfo.getGroupName()); + } + + return this.list(queryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java new file mode 100644 index 0000000..7c709fe --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java @@ -0,0 +1,73 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; + +import com.muyu.domain.FaultLog; +import com.muyu.enterprise.mapper.FaultLogMapper; +import com.muyu.enterprise.service.FaultLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：IFaultLogServiceImpl + * @Description TODO + * @Date：2024/9/16 20:37 + */ +@Service +public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { + + +@Autowired +private FaultLogMapper faultLogMapper; + + @Override + public List pageQuery(FaultLog fault) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(fault.getFaultCode())) { + queryWrapper.like(FaultLog::getFaultCode, fault.getFaultCode()); + } + if (StringUtils.isNotEmpty(fault.getVin())) { + queryWrapper.like(FaultLog::getVin, fault.getVin()); + } + + // 时间区间查询 + if (fault.getWarningTime() != null ) { + queryWrapper.gt(FaultLog::getWarningTime, fault.getWarningTime()); + } + + + + if (fault.getNormalTime() != null ) { + queryWrapper.lt(FaultLog::getNormalTime, fault.getNormalTime()); + } + + + return this.list(queryWrapper); + } + + /** + * 添加 + * @param log + */ + @Override + public int insertFaultLog(FaultLog log) { + + return 0; + } + /** + *修改 + * @param log + */ + @Override + public int updateFaultLogByStatus(FaultLog log) { + log.setId(faultLogMapper.selectFaultId(log)); + return faultLogMapper.updateFaultLogByTime(log); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultServiceImpl.java new file mode 100644 index 0000000..d4d15d5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultServiceImpl.java @@ -0,0 +1,63 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.domain.BaseEntity; + +import com.muyu.domain.Fault; +import com.muyu.enterprise.mapper.FaultMapper; +import com.muyu.enterprise.service.FaultService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：IFaultServiceImpl + * @Description TODO + * @Date：2024/9/18 11:14 + */ +@Service +public class FaultServiceImpl extends ServiceImpl implements FaultService { + + + @Autowired + private FaultMapper faultMapper; + + /** + * + * @param fault 车辆故障管理主键 + * @return fault + */ + @Override + public List pageQuery(Fault fault) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(fault.getFaultCode())) { + queryWrapper.like(Fault::getFaultCode, fault.getFaultCode()); + } + if (StringUtils.isNotEmpty(fault.getFaultType())) { + queryWrapper.like(Fault::getFaultType, fault.getFaultType()); + } + if (StringUtils.isNotEmpty(fault.getFaultName())) { + queryWrapper.like(Fault::getFaultName, fault.getFaultName()); + } + + + Object beginTime = fault.getParams().get("beginTime"); + if (Objects.nonNull(beginTime) && beginTime instanceof Date beginDate) { + queryWrapper.gt(BaseEntity::getCreateTime, beginDate); + } + Object endTime = fault.getParams().get("endTime"); + if (Objects.nonNull(endTime) && endTime instanceof Date endDate) { + queryWrapper.lt(BaseEntity::getCreateTime, endDate); + } + return this.list(queryWrapper); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/RuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/RuleServiceImpl.java new file mode 100644 index 0000000..4d1bff7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/RuleServiceImpl.java @@ -0,0 +1,106 @@ +package com.muyu.enterprise.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; + +import com.muyu.domain.*; +import com.muyu.domain.vo.RuleVo; +import com.muyu.enterprise.mapper.RuleMapper; +import com.muyu.enterprise.service.RuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：ChenYan + * @Project：2112-car-cloud-server + * @Package：com.muyu.fault.service + * @Filename：RuleServiceImpl + * @Description TODO + * @Date：2024/9/21 18:49 + */ +@Service +public class RuleServiceImpl extends ServiceImpl implements RuleService { + + + @Autowired + private RuleMapper ruleMapper; + + /** + * + * @param fault 车辆故障管理主键 + * @return fault + */ + @Override + public List pageQuery(Rule fault) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (fault.getRuleValue()!=null) { + queryWrapper.like(Rule::getRuleValue, fault.getRuleValue()); + } + return this.list(queryWrapper); + } + + @Override + public List pageQueryRule(RuleVo fault) { + Listlist=ruleMapper.pageQueryRule(fault); + return list; + } + + /** + * 下拉框 + * @param fault + * @return + */ + @Override + public Result> pageQueryList(Custom fault) { + Listlist=ruleMapper.pageQueryList(fault); + return Result.success(list,"成功"); + } + + @Override + public Result> pageQueryCar(Vehicle fault) { + Listlist=ruleMapper.pageQueryCar(fault); + return Result.success(list,"成功"); + } + + @Override + public Result> pageQueryType(Type fault) { + Listlist=ruleMapper.pageQueryType(fault); + return Result.success(list,"成功"); + } + + @Override + public Result> pageQueryMessageValue(MessageValue fault) { + Listlist=ruleMapper.pageQueryMessageValue(fault); + return Result.success(list,"成功"); + } + + + /*** + * 车辆故障管理insertFault + * @param faultInfo + * @return + */ + @Override + public int insertFault(Rule faultInfo) { + int i = ruleMapper.insertFault(faultInfo); + return i; + } + + + /** + * 车辆故障管理updateFault + * @param faultInfo + * @return + */ + @Override + public int updateFault(Rule faultInfo) { + int i = ruleMapper.updateFault(faultInfo); + return i; + } + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index 66bc686..7b9d33f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -8,7 +8,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/FaultLogMapper.xml new file mode 100644 index 0000000..9de29e6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/FaultLogMapper.xml @@ -0,0 +1,29 @@ + + + + + + insert into faultlog (fault_code, vin, warning_time) + values + + (#{temp.faultCode},#{temp.vin},#{temp.warningTime}) + + + + + update faultlog + set normal_time = #{normalTime} + where id = #{id} + + + + + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/RuleMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/RuleMapper.xml new file mode 100644 index 0000000..089eaa2 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/RuleMapper.xml @@ -0,0 +1,54 @@ + + + + + INSERT INTO `vehicle-basic`.`rule` ( `message_id`, `car_id`, `c_id`, `t_id`, `rule_value`) + VALUES ( #{messageId}, #{carId}, #{cId}, #{tId}, #{ruleValue}) + + + + + UPDATE `rule` + SET `message_id`=#{messageId}, + `car_id` = #{carId}, + `c_id` = #{cId}, + `t_id` = #{tId}, + `rule_value` = #{ruleValue} + WHERE `id` = #{id}; + + + + + + + + + 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 489071b..c4aff0e 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # 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 97fb5ad..170ff21 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml index d0dbae7..9fdf2a5 100644 --- a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # Spring spring: diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml index 619fc26..d0b196d 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # 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 b5ea3d8..bc6720d 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml index 96bbaaa..a3defa9 100644 --- a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: warn + namespace: fault # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -58,13 +58,3 @@ spring: logging: level: com.muyu.system.mapper: DEBUG -aliyun: - access-key-id: LTAI5t7Fnx2QLTYLSu9357wP - access-key-secret: 3LOnydNZ25ytsTGczuSygElx0HJ6nN - endpoint: ecs-cn-hangzhou.aliyuncs.com - region-id: cn-shanghai - image-id: m-uf66taa8r57ky0pg3e7s - instance-type: ecs.t6-c1m1.large - security-group-id: sg-uf6hyictocodexptlgiv - switch-id: vsw-uf6ags5luz17qd6ckn2tb - amount: 1 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 8ce1850..b3402fd 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.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fault # Spring spring: