diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java index 9d5431e..4da3305 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java @@ -2,6 +2,9 @@ package com.zhilian.business.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.domain.request.BreakReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -19,7 +22,7 @@ import com.zhilian.business.service.IBusinessBreakService; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.utils.poi.ExcelUtil; -import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.core.web.page.*; /** * 故障Controller @@ -37,12 +40,12 @@ public class BusinessBreakController extends BaseController /** * 查询故障列表 */ - @RequiresPermissions("business:break:list") +// @RequiresPermissions("business:break:list") @GetMapping("/list") - public Result> list(BusinessBreak businessBreak) + public Result> list(BreakReq breakReq) { startPage(); - List list = businessBreakService.selectBusinessBreakList(businessBreak); + List list = businessBreakService.selectBusinessBreakList(breakReq); return getDataTable(list); } @@ -52,9 +55,9 @@ public class BusinessBreakController extends BaseController @RequiresPermissions("business:break:export") @Log(title = "故障", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, BusinessBreak businessBreak) + public void export(HttpServletResponse response, BreakReq breakReq) { - List list = businessBreakService.selectBusinessBreakList(businessBreak); + List list = businessBreakService.selectBusinessBreakList(breakReq); ExcelUtil util = new ExcelUtil(BusinessBreak.class); util.exportExcel(response, list, "故障数据"); } @@ -101,4 +104,14 @@ public class BusinessBreakController extends BaseController { return toAjax(businessBreakService.deleteBusinessBreakByBreakIds(breakIds)); } + + /** + * 故障日志 + */ + @PostMapping("breakLog") + public Result> breakLog(){ + List list = businessBreakService.breakLog(); + Result> success = Result.success(list); + return success; + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java new file mode 100644 index 0000000..068c39d --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -0,0 +1,30 @@ +package com.zhilian.business.domain; + +import com.zhilian.common.core.web.page.PageResult; +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @ClassName BreakLog + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 15:07 + */ +@Data +public class BreakLog { + + /** 故障日志id */ + private Integer breakLogId; + /** 故障码 */ + private String breakCode; + /** 车辆VIN */ + private String breakVin; + /** 故障类型 */ + private String breakType; + /** 结束报警时间 */ + private String breakTime; + /** 开始报警时间 */ + private String breakDate; + /** 是否报警 */ + private String breakState; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java new file mode 100644 index 0000000..ad62483 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java @@ -0,0 +1,24 @@ +package com.zhilian.business.domain.request; + +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName BreakReq + * @Description TODO + * @Author YuanYongH + * @Date 2024/4/8 15:28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BreakReq { + private Integer breakId; + private String breakCode; + private String breakVin; + private String breakType; +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java index ec456bc..65409ba 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java @@ -1,19 +1,22 @@ package com.zhilian.business.mapper; import java.util.List; + +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.domain.request.BreakReq; /** * 故障Mapper接口 - * + * * @author Yy * @date 2024-04-07 */ -public interface BusinessBreakMapper +public interface BusinessBreakMapper { /** * 查询故障 - * + * * @param breakId 故障主键 * @return 故障 */ @@ -21,15 +24,15 @@ public interface BusinessBreakMapper /** * 查询故障列表 - * - * @param businessBreak 故障 + * + * @param breakReq 故障 * @return 故障集合 */ - public List selectBusinessBreakList(BusinessBreak businessBreak); + public List selectBusinessBreakList(BreakReq breakReq); /** * 新增故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -37,7 +40,7 @@ public interface BusinessBreakMapper /** * 修改故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -45,7 +48,7 @@ public interface BusinessBreakMapper /** * 删除故障 - * + * * @param breakId 故障主键 * @return 结果 */ @@ -53,9 +56,12 @@ public interface BusinessBreakMapper /** * 批量删除故障 - * + * * @param breakIds 需要删除的数据主键集合 * @return 结果 */ public int deleteBusinessBreakByBreakIds(Long[] breakIds); + + List breakLog(); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java index 99c301f..b49d544 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java @@ -1,19 +1,22 @@ package com.zhilian.business.service; import java.util.List; + +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.domain.request.BreakReq; /** * 故障Service接口 - * + * * @author Yy * @date 2024-04-07 */ -public interface IBusinessBreakService +public interface IBusinessBreakService { /** * 查询故障 - * + * * @param breakId 故障主键 * @return 故障 */ @@ -21,15 +24,15 @@ public interface IBusinessBreakService /** * 查询故障列表 - * - * @param businessBreak 故障 + * + * @param breakReq 故障 * @return 故障集合 */ - public List selectBusinessBreakList(BusinessBreak businessBreak); + public List selectBusinessBreakList(BreakReq breakReq); /** * 新增故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IBusinessBreakService /** * 修改故障 - * + * * @param businessBreak 故障 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IBusinessBreakService /** * 批量删除故障 - * + * * @param breakIds 需要删除的故障主键集合 * @return 结果 */ @@ -53,9 +56,12 @@ public interface IBusinessBreakService /** * 删除故障信息 - * + * * @param breakId 故障主键 * @return 结果 */ public int deleteBusinessBreakByBreakId(Long breakId); + + List breakLog(); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java index 0602cae..90be7e5 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java @@ -1,6 +1,9 @@ package com.zhilian.business.service.impl; import java.util.List; + +import com.zhilian.business.domain.BreakLog; +import com.zhilian.business.domain.request.BreakReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhilian.business.mapper.BusinessBreakMapper; @@ -34,13 +37,13 @@ public class BusinessBreakServiceImpl implements IBusinessBreakService /** * 查询故障列表 * - * @param businessBreak 故障 + * @param breakReq 故障 * @return 故障 */ @Override - public List selectBusinessBreakList(BusinessBreak businessBreak) + public List selectBusinessBreakList(BreakReq breakReq) { - return businessBreakMapper.selectBusinessBreakList(businessBreak); + return businessBreakMapper.selectBusinessBreakList(breakReq); } /** @@ -90,4 +93,9 @@ public class BusinessBreakServiceImpl implements IBusinessBreakService { return businessBreakMapper.deleteBusinessBreakByBreakId(breakId); } + + @Override + public List breakLog() { + return businessBreakMapper.breakLog(); + } } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml index 9aecbef..0379105 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml @@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where break_id = #{breakId} + insert into business_break