diff --git a/zhilian-modules/zhilian-business/pom.xml b/zhilian-modules/zhilian-business/pom.xml index 6e869f8..d009576 100644 --- a/zhilian-modules/zhilian-business/pom.xml +++ b/zhilian-modules/zhilian-business/pom.xml @@ -106,4 +106,4 @@ - \ No newline at end of file + 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 new file mode 100644 index 0000000..9d5431e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java @@ -0,0 +1,104 @@ +package com.zhilian.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.business.domain.BusinessBreak; +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; + +/** + * 故障Controller + * + * @author Yy + * @date 2024-04-07 + */ +@RestController +@RequestMapping("/break") +public class BusinessBreakController extends BaseController +{ + @Autowired + private IBusinessBreakService businessBreakService; + + /** + * 查询故障列表 + */ + @RequiresPermissions("business:break:list") + @GetMapping("/list") + public Result> list(BusinessBreak businessBreak) + { + startPage(); + List list = businessBreakService.selectBusinessBreakList(businessBreak); + return getDataTable(list); + } + + /** + * 导出故障列表 + */ + @RequiresPermissions("business:break:export") + @Log(title = "故障", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BusinessBreak businessBreak) + { + List list = businessBreakService.selectBusinessBreakList(businessBreak); + ExcelUtil util = new ExcelUtil(BusinessBreak.class); + util.exportExcel(response, list, "故障数据"); + } + + /** + * 获取故障详细信息 + */ + @RequiresPermissions("business:break:query") + @GetMapping(value = "/{breakId}") + public Result getInfo(@PathVariable("breakId") Long breakId) + { + return success(businessBreakService.selectBusinessBreakByBreakId(breakId)); + } + + /** + * 新增故障 + */ + @RequiresPermissions("business:break:add") + @Log(title = "故障", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.insertBusinessBreak(businessBreak)); + } + + /** + * 修改故障 + */ + @RequiresPermissions("business:break:edit") + @Log(title = "故障", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody BusinessBreak businessBreak) + { + return toAjax(businessBreakService.updateBusinessBreak(businessBreak)); + } + + /** + * 删除故障 + */ + @RequiresPermissions("business:break:remove") + @Log(title = "故障", businessType = BusinessType.DELETE) + @DeleteMapping("/{breakIds}") + public Result remove(@PathVariable Long[] breakIds) + { + return toAjax(businessBreakService.deleteBusinessBreakByBreakIds(breakIds)); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java index 42495d0..425d1a2 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Break.java @@ -1,5 +1,6 @@ package com.zhilian.business.domain; +import io.swagger.models.auth.In; import lombok.Data; import java.util.Date; @@ -18,38 +19,26 @@ public class Break { private Integer breakId; /** * 故障码 - **/ + **/ private String breakCode; /** - * 车牌号 - **/ - private String breakCar; - /** - * 车辆VIN码 - **/ + * 车辆VIN + **/ private String breakVin; /** - * 故障时间 - **/ + * 开始报警时间 + **/ + private Date breakDate; + /** + * 结束报警时间 + **/ private Date breakTime; /** * 故障类型 - **/ + **/ private String breakType; /** - * 故障级别 - **/ - private Integer breakRank; - /** - * 故障状态 - **/ + * 故障状态 是否警告 + **/ private Integer breakState; - /** - * 故障设备 - **/ - private String breakDevice; - /** - * 故障描述 - **/ - private String breakDesc; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java new file mode 100644 index 0000000..e902cf1 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BusinessBreak.java @@ -0,0 +1,112 @@ +package com.zhilian.business.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; + +/** + * 故障对象 business_break + * + * @author Yy + * @date 2024-04-07 + */ +@Data +public class BusinessBreak extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long breakId; + + /** 故障码 */ + @Excel(name = "故障码") + private String breakCode; + + /** 车辆VIN */ + @Excel(name = "车辆VIN") + private String breakVin; + + /** 结束报警时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束报警时间", width = 30, dateFormat = "yyyy-MM-dd") + private String breakTime; + + /** 故障类型 */ + @Excel(name = "故障类型") + private String breakType; + + /** 开始报警时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始报警时间", width = 30, dateFormat = "yyyy-MM-dd") + private String breakDate; + + /** 是否警告 */ + @Excel(name = "是否警告") + private String breakState; + + public void setBreakId(Long breakId) + { + this.breakId = breakId; + } + + public Long getBreakId() + { + return breakId; + } + public void setBreakCode(String breakCode) + { + this.breakCode = breakCode; + } + + public String getBreakCode() + { + return breakCode; + } + public void setBreakVin(String breakVin) + { + this.breakVin = breakVin; + } + + public String getBreakVin() + { + return breakVin; + } + + + public void setBreakType(String breakType) + { + this.breakType = breakType; + } + + public String getBreakType() + { + return breakType; + } + + public void setBreakState(String breakState) + { + this.breakState = breakState; + } + + public String getBreakState() + { + return breakState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("breakId", getBreakId()) + .append("breakCode", getBreakCode()) + .append("breakVin", getBreakVin()) + .append("breakTime", getBreakTime()) + .append("breakType", getBreakType()) + .append("breakDate", getBreakDate()) + .append("breakState", getBreakState()) + .toString(); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java index 02aaf9a..2d959d4 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakMapper.java @@ -4,6 +4,7 @@ import com.zhilian.business.domain.Break; import com.zhilian.business.domain.BreakVo; import org.apache.ibatis.annotations.Mapper; +import java.util.Date; import java.util.List; /** @@ -22,5 +23,5 @@ public interface BreakMapper { int breakDel(Integer breakId); - Integer addBreak(String breakCar, String breakVin, String breakType, Integer breakRank, Integer breakState); + Integer addBreak(String breakCode, String breakVin, Date breakTime, Date breakDate, String breakType, Integer breakState); } 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 new file mode 100644 index 0000000..ec456bc --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BusinessBreakMapper.java @@ -0,0 +1,61 @@ +package com.zhilian.business.mapper; + +import java.util.List; +import com.zhilian.business.domain.BusinessBreak; + +/** + * 故障Mapper接口 + * + * @author Yy + * @date 2024-04-07 + */ +public interface BusinessBreakMapper +{ + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障集合 + */ + public List selectBusinessBreakList(BusinessBreak businessBreak); + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int insertBusinessBreak(BusinessBreak businessBreak); + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int updateBusinessBreak(BusinessBreak businessBreak); + + /** + * 删除故障 + * + * @param breakId 故障主键 + * @return 结果 + */ + public int deleteBusinessBreakByBreakId(Long breakId); + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusinessBreakByBreakIds(Long[] breakIds); +} 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 new file mode 100644 index 0000000..99c301f --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/IBusinessBreakService.java @@ -0,0 +1,61 @@ +package com.zhilian.business.service; + +import java.util.List; +import com.zhilian.business.domain.BusinessBreak; + +/** + * 故障Service接口 + * + * @author Yy + * @date 2024-04-07 + */ +public interface IBusinessBreakService +{ + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + public BusinessBreak selectBusinessBreakByBreakId(Long breakId); + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障集合 + */ + public List selectBusinessBreakList(BusinessBreak businessBreak); + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int insertBusinessBreak(BusinessBreak businessBreak); + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + public int updateBusinessBreak(BusinessBreak businessBreak); + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的故障主键集合 + * @return 结果 + */ + public int deleteBusinessBreakByBreakIds(Long[] breakIds); + + /** + * 删除故障信息 + * + * @param breakId 故障主键 + * @return 结果 + */ + public int deleteBusinessBreakByBreakId(Long breakId); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java index ada8d22..2cbd72a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakServiceImpl.java @@ -34,7 +34,7 @@ public class BreakServiceImpl implements BreakService { public int breakAdd(Break break1) { int i = breakMapper.breakAdd(break1); if (i>0){ - breakMapper.addBreak(break1.getBreakCar(),break1.getBreakVin(),break1.getBreakType(),break1.getBreakRank(),break1.getBreakState()); + breakMapper.addBreak(break1.getBreakCode(),break1.getBreakVin(),break1.getBreakTime(),break1.getBreakDate(),break1.getBreakType(),break1.getBreakState()); } return i; } 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 new file mode 100644 index 0000000..0602cae --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BusinessBreakServiceImpl.java @@ -0,0 +1,93 @@ +package com.zhilian.business.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zhilian.business.mapper.BusinessBreakMapper; +import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.service.IBusinessBreakService; + +/** + * 故障Service业务层处理 + * + * @author Yy + * @date 2024-04-07 + */ +@Service +public class BusinessBreakServiceImpl implements IBusinessBreakService +{ + @Autowired + private BusinessBreakMapper businessBreakMapper; + + /** + * 查询故障 + * + * @param breakId 故障主键 + * @return 故障 + */ + @Override + public BusinessBreak selectBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.selectBusinessBreakByBreakId(breakId); + } + + /** + * 查询故障列表 + * + * @param businessBreak 故障 + * @return 故障 + */ + @Override + public List selectBusinessBreakList(BusinessBreak businessBreak) + { + return businessBreakMapper.selectBusinessBreakList(businessBreak); + } + + /** + * 新增故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + @Override + public int insertBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.insertBusinessBreak(businessBreak); + } + + /** + * 修改故障 + * + * @param businessBreak 故障 + * @return 结果 + */ + @Override + public int updateBusinessBreak(BusinessBreak businessBreak) + { + return businessBreakMapper.updateBusinessBreak(businessBreak); + } + + /** + * 批量删除故障 + * + * @param breakIds 需要删除的故障主键 + * @return 结果 + */ + @Override + public int deleteBusinessBreakByBreakIds(Long[] breakIds) + { + return businessBreakMapper.deleteBusinessBreakByBreakIds(breakIds); + } + + /** + * 删除故障信息 + * + * @param breakId 故障主键 + * @return 结果 + */ + @Override + public int deleteBusinessBreakByBreakId(Long breakId) + { + return businessBreakMapper.deleteBusinessBreakByBreakId(breakId); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml index 81f08f3..4f805b1 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakMapper.xml @@ -4,12 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) - values(#{breakDevice},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + - insert into business_breakdown(break_device,break_type,break_rank,break_state,break_time,break_desc,break_id,break_car,break_vin) - values(#{breakCar},#{breakType},#{breakRank},#{breakState},#{breakTime},#{breakDesc},#{breakId},#{breakCar},#{breakVin}) + diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml new file mode 100644 index 0000000..9aecbef --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BusinessBreakMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + select break_id, break_code, break_vin, break_time, break_type, break_date, break_state from business_break + + + + + + + + insert into business_break + + break_code, + break_vin, + break_time, + break_type, + break_date, + break_state, + + + #{breakCode}, + #{breakVin}, + #{breakTime}, + #{breakType}, + #{breakDate}, + #{breakState}, + + + + + update business_break + + break_code = #{breakCode}, + break_vin = #{breakVin}, + break_time = #{breakTime}, + break_type = #{breakType}, + break_date = #{breakDate}, + break_state = #{breakState}, + + where break_id = #{breakId} + + + + delete from business_break where break_id = #{breakId} + + + + delete from business_break where break_id in + + #{breakId} + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml index 040cfe5..cf9d6d2 100644 --- a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml @@ -4,6 +4,22 @@ server: # Spring spring: +# 正确格式 + datasource: + dynamic: + strict: false + primary: one + datasource: + one: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://10.10.25.1:3306/zhilian-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: fffdev + two: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/demo1?allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false + username: root + password: 123456 redis: host: 10.10.25.3 port: 6379