diff --git a/cloud-modules/cloud-modules-wechat/pom.xml b/cloud-modules/cloud-modules-wechat/pom.xml index 8d94920..cb09980 100644 --- a/cloud-modules/cloud-modules-wechat/pom.xml +++ b/cloud-modules/cloud-modules-wechat/pom.xml @@ -11,6 +11,10 @@ cloud-modules-wechat + + cloud-modules-wechat 微信公众号模块 + + 17 17 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java index 3cc0014..b6bf5a6 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java @@ -9,7 +9,7 @@ import lombok.*; /** * 企业信息 sys_car_enterprise - * @author YuanZiLong + * @author 袁子龙 * @package com.muyu.breakdown.domain * @name: SysCarEnterprise * @date: 2024/9/26 19:54 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java index af996e5..5fb7709 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFault.java @@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆故障管理对象 sys_car_fault - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFault * @date: 2024/9/20 10:56 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java index ad4ccc0..ca1c029 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultLog.java @@ -12,7 +12,7 @@ import java.util.Date; /** * 故障记录对象 sys_car_fault_log - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFaultLog * @date: 2024/9/22 20:17 diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java index fff86b4..c4057cb 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarFaultMessage.java @@ -11,7 +11,7 @@ import java.util.Date; /** * 站内信息对象 sys_car_fault_message - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.domain * @name: SysCarFaultMessage * @date: 2024/9/22 11:57 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java index fcc437c..6a06040 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java @@ -9,6 +9,8 @@ import com.muyu.common.domain.SysCarFault; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.server.service.SysCarFaultService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -18,24 +20,26 @@ import java.util.Arrays; import java.util.List; /** - * 故障码 接口控制层 - * @author YuanZiLong + * 车辆故障码 接口控制层 + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultController * @date: 2024/9/20 11:00 */ @RestController @RequestMapping("/breakdown") +@Tag(name = "车辆故障码",description = "车辆故障码管理") public class SysCarFaultController extends BaseController { @Resource private SysCarFaultService sysCarFaultService; /** - * 查询车辆故障管理列表 + * 查询车辆故障码管理列表 */ @RequiresPermissions("breakdown:breakdown:list") @GetMapping("/list") + @Operation(summary = "查询车辆故障码管理列表",description ="查询车辆故障码管理列表") public Result> list(SysCarFault sysCarFault) { startPage(); @@ -46,10 +50,11 @@ public class SysCarFaultController extends BaseController /** - * 导出车辆故障管理列表 + * 导出车辆故障码管理列表 */ @RequiresPermissions("breakdown:breakdown:export") @PostMapping("/export") + @Operation(summary = "导出车辆故障码管理列表",description = "导出车辆故障码管理列表") public void export(HttpServletResponse response, SysCarFault sysCarFault) { List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); @@ -58,20 +63,22 @@ public class SysCarFaultController extends BaseController } /** - * 获取车辆故障管理详细信息 + * 获取车辆故障码管理详细信息 */ @RequiresPermissions("breakdown:breakdown:query") @GetMapping(value = "/{id}") + @Operation(summary = "获取车辆故障码管理详细信息") public Result> getInfo(@PathVariable("id") Long id) { return success(sysCarFaultService.selectSysCarFaultById(id)); } /** - * 新增车辆故障管理 + * 新增车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:add") @PostMapping + @Operation(summary = "新增车辆故障码管理") public Result add( @Validated @RequestBody SysCarFault sysCarFault) { @@ -80,18 +87,17 @@ public class SysCarFaultController extends BaseController if (selectFaultByFaultCode!=null){ return error("新增车辆故障 ,故障码已存在"); } - - sysCarFault.setCreateBy(SecurityUtils.getUsername()); return toAjax(sysCarFaultService.save(sysCarFault)); } /** - * 修改车辆故障管理 + * 修改车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:edit") @PutMapping + @Operation(summary = "修改车辆故障码管理") public Result edit( @Validated @RequestBody SysCarFault sysCarFault) { @@ -101,10 +107,11 @@ public class SysCarFaultController extends BaseController } /** - * 删除车辆故障管理 + * 删除车辆故障码管理 */ @RequiresPermissions("breakdown:breakdown:remove") @DeleteMapping("/{ids}") + @Operation(summary = "删除车辆故障码管理") public Result remove(@PathVariable("ids") Long[] ids) { sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); @@ -112,21 +119,23 @@ public class SysCarFaultController extends BaseController } /** - * 启用告警 + * 启用故障码警告 * @param id */ @PutMapping("/enableWarningsById/{id}") + @Operation(summary = "启用故障码警告") public void enableWarningsById(@PathVariable("id")Long id){ UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id",id); wrapper.set("warn_status",0); - sysCarFaultService.update(wrapper); + sysCarFaultService.update(wrapper); } /** - * 禁用告警 + * 禁用故障码告警 * @param id */ @PutMapping("/disableWarningsById/{id}") + @Operation(summary = "禁用故障码告警") public void disableWarningsById(@PathVariable("id")Long id){ UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id",id); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java index 3c4063d..4f4aca9 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultLogController.java @@ -7,6 +7,8 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.domain.SysCarFaultLog; import com.muyu.server.service.SysCarFaultLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,25 +18,38 @@ import java.util.List; /** * 车辆故障记录 接口控制层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultLogController * @date: 2024/9/22 21:08 */ @RestController @RequestMapping("/log") +@Tag(name = "车辆故障记录",description = "车辆故障记录管理") public class SysCarFaultLogController extends BaseController { @Autowired private SysCarFaultLogService service; + /** + * 查询故障记录列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/list") + @Operation(summary = "查询故障记录列表") public Result> list(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.selectSysCarFaultLogList(sysCarFaultLog); return getDataTable(list); } + /** + * 查询故障记录状态为忽略的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusIgnore") + @Operation(summary = "查询故障记录状态为忽略的数据列表") public Result>listStatusIgnore(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusIgnore(sysCarFaultLog); @@ -42,29 +57,51 @@ public class SysCarFaultLogController extends BaseController { } - - + /** + * 查询故障记录状态为已解决的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusSolve") + @Operation(summary = "查询故障记录状态为已解决的数据列表") public Result>listStatusSolve(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusSolve(sysCarFaultLog); return getDataTable(list); } + /** + * 查询故障记录状态为处理中的数据列表 + * @param sysCarFaultLog + * @return + */ @PostMapping("/listStatusProcess") + @Operation(summary = "查询故障记录状态为处理中的数据列表") public Result>listStatusProcess(@RequestBody SysCarFaultLog sysCarFaultLog){ startPage(); List list = service.listStatusProcess(sysCarFaultLog); return getDataTable(list); } + /** + * 新增故障记录 + * @param sysCarFaultLog + * @return + */ @PostMapping("/add") + @Operation(summary = "新增故障记录") public Result add(@RequestBody SysCarFaultLog sysCarFaultLog){ return toAjax(service.save(sysCarFaultLog)); } + /** + * 导出故障记录 + * @param response + * @param sysCarFaultLog + */ @PostMapping("/export") + @Operation(summary = "导出故障记录") public void export(HttpServletResponse response, SysCarFaultLog sysCarFaultLog){ List list = service.selectSysCarFaultLogList(sysCarFaultLog); ExcelUtil util = new ExcelUtil(SysCarFaultLog.class); @@ -72,11 +109,12 @@ public class SysCarFaultLogController extends BaseController { } /** - * 修改为忽略 + * 把处理中的数据修改为忽略 * @param idsStr * @return */ @PutMapping("/updateStatusById/{ids}") + @Operation(summary = "把处理中的数据修改为忽略") public Result updateStatusById(@PathVariable("ids")String idsStr){ Long[] ids = Arrays.stream(idsStr.split(",")) .map(Long::valueOf) diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java index 6446fb1..566cc0f 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultMessageController.java @@ -14,7 +14,7 @@ import java.util.List; /** * 站内信 接口控制层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.controller * @name: SysCarFaultMessageController * @date: 2024/9/22 14:39 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java index 465dd39..69ef63a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarLogController.java @@ -12,7 +12,13 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; +/** + * 车辆日志管理 接口控制层 + * @author 袁子龙 + * @package: com.muyu.breakdown.controller + * @name: SysCarLogController + * @date: 2024/9/22 14:39 + */ @RestController @RequestMapping("/sysCarLog") diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java index 3f41996..809ae38 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultLogMapper.java @@ -8,7 +8,7 @@ import java.util.List; /** * 故障记录日志 管理层 - * @author YuanZiLong + * @author 袁子龙 * @package com.muyu.breakdown.mapper * @name: SysCarFaultLogMapper * @date: 2024/9/22 21:06 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java index 5cebf68..2ef819c 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * 车辆故障码 管理层 - * @author YuanZiLong + * @author 袁子龙 * @Package: com.muyu.breakdown.mapper * @Name: SysCarFaultMapper * @Date: 2024/9/20 10:57 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java index e02c29b..5d4622a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * 站内信 管理层 - * @author YuanZiLong + * @author 袁子龙 * @packer: com.muyu.breakdown.mapper * @name: SysCarFaultMessageMapper * @date: 2024/9/22 11:59 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java index 633bf3f..0770a9a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultLogService.java @@ -7,7 +7,7 @@ import java.util.List; /** * 车辆故障记录 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name: SysCarFaultLogService * @date: 2024/9/22 21:07 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java index 76ce658..41a76c0 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultMessageService.java @@ -7,7 +7,7 @@ import java.util.List; /** * 站内信 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name: SysCarFaultMessageService * @date: 2024/9/22 14:35 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java index 4ef0f74..37cad97 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java @@ -7,7 +7,7 @@ import java.util.List; /** * 车辆故障码 服务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service * @name : SysCarFaultService * @date: 2024/9/20 10:57 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java index 94378dd..a58bc5a 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultLogServiceImpl.java @@ -11,7 +11,7 @@ import java.util.List; /** * 车辆故障记录 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: sysCarFaultLogServiceImpl * @date: 2024/9/22 21:07 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java index 244caaa..17551e0 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java @@ -12,7 +12,7 @@ import java.util.List; /** * 站内信 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: SysCarFaultMessageServiceImpl * @date: 2024/9/22 14:36 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java index ef2ac45..b931a71 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; /** * 车辆故障码 业务层 - * @author YuanZiLong + * @author 袁子龙 * @package: com.muyu.breakdown.service.impl * @name: SysCarFaultServiceImpl * @date: 2024/9/20 10:58 diff --git a/pom.xml b/pom.xml index addb590..88fbe3a 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,11 @@ cloud-common-saas ${muyu.version} + + com.muyu + cloud-common-swagger + ${muyu.version} + @@ -287,6 +292,7 @@ cloud-visual cloud-modules cloud-common + cloud-common pom