diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java index 6768543..129761c 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java @@ -5,16 +5,9 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.platform.domain.entity.ProjectManager; +import org.dromara.platform.domain.ProjectManager; import org.dromara.platform.listener.ProjectManagerListener; import org.dromara.platform.service.ProjectManagerService; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java new file mode 100644 index 0000000..c4d438c --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java @@ -0,0 +1,105 @@ +package org.dromara.platform.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.platform.domain.vo.WorkOrderInfoVo; +import org.dromara.platform.domain.bo.WorkOrderInfoBo; +import org.dromara.platform.service.IWorkOrderInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工单信息 + * + * @author gejunhao + * @date 2025-01-10 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/workorder") +public class WorkOrderInfoController extends BaseController { + + private final IWorkOrderInfoService workOrderInfoService; + + /** + * 查询工单信息列表 + */ + @SaCheckPermission("platform:workorder:list") + @GetMapping("/list") + public TableDataInfo list(WorkOrderInfoBo bo, PageQuery pageQuery) { + return workOrderInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出工单信息列表 + */ + @SaCheckPermission("platform:workorder:export") + @Log(title = "工单信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WorkOrderInfoBo bo, HttpServletResponse response) { + List list = workOrderInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工单信息", WorkOrderInfoVo.class, response); + } + + /** + * 获取工单信息详细信息 + * + * @param workOrderId 主键 + */ + @SaCheckPermission("platform:workorder:query") + @GetMapping("/{workOrderId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long workOrderId) { + return R.ok(workOrderInfoService.queryById(workOrderId)); + } + + /** + * 新增工单信息 + */ + @SaCheckPermission("platform:workorder:add") + @Log(title = "工单信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/add") + public R add(@Validated(AddGroup.class) @RequestBody WorkOrderInfoBo bo) { + return toAjax(workOrderInfoService.insertByBo(bo)); + } + + /** + * 修改工单信息 + */ + @SaCheckPermission("platform:workorder:edit") + @Log(title = "工单信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WorkOrderInfoBo bo) { + return toAjax(workOrderInfoService.updateByBo(bo)); + } + + /** + * 删除工单信息 + * + * @param workOrderIds 主键串 + */ + @SaCheckPermission("platform:workorder:remove") + @Log(title = "工单信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{workOrderIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] workOrderIds) { + return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(workOrderIds), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/entity/ProjectManager.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java similarity index 96% rename from ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/entity/ProjectManager.java rename to ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java index 86bda69..c9abc31 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/entity/ProjectManager.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java @@ -1,4 +1,4 @@ -package org.dromara.platform.domain.entity; +package org.dromara.platform.domain; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java new file mode 100644 index 0000000..3ec5baa --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java @@ -0,0 +1,123 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +import java.io.Serial; + +/** + * 工单信息对象 work_order_info + * + * @author gejunhao + * @date 2025-01-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("work_order_info") +public class WorkOrderInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 工单ID + */ + @TableId(value = "work_order_id") + private Long workOrderId; + + /** + * 所属项目 + */ + private String projectName; + + /** + * 报修人员 + */ + private String repairer; + + /** + * 保修人员ID + */ + private Long repairerId; + + /** + * 是否事故 (0: 否, 1: 是) + */ + private Long isAccident; + + /** + * 响应级别 (0: 常规, 1: 紧急, 2: 特急) + */ + private String responseLevel; + + /** + * 响应时限 + */ + private Long responseTime; + + /** + * 故障大类 + */ + private String faultCategory; + + /** + * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) + */ + private String faultSubcategory; + + /** + * 所属机构 + */ + private String institution; + + /** + * 故障地点 + */ + private String faultLocation; + + /** + * 故障描述 + */ + private String faultDescription; + + /** + * 故障图片 + */ + private String faultImage; + + /** + * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) + */ + private String maintenanceRequirement; + + /** + * 派遣意见 + */ + private String dispatchOpinion; + + /** + * 是否派遣 (0: 否, 1: 是) + */ + private Long isDispatched; + + /** + * 纬度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + + /** + * 创建人 + */ + private String creator; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java new file mode 100644 index 0000000..79abe22 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java @@ -0,0 +1,140 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +/** + * 工单信息业务对象 work_order_info + * + * @author gejunhao + * @date 2025-01-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WorkOrderInfo.class, reverseConvertGenerate = false) +public class WorkOrderInfoBo extends BaseEntity { + + /** + * 工单ID + */ + @NotNull(message = "工单ID不能为空", groups = { EditGroup.class }) + private Long workOrderId; + + /** + * 所属项目 + */ + @NotBlank(message = "所属项目不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 报修人员 + */ + @NotBlank(message = "报修人员不能为空", groups = { AddGroup.class, EditGroup.class }) + private String repairer; + + /** + * 保修人员ID + */ + @NotNull(message = "保修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long repairerId; + + /** + * 是否事故 (0: 否, 1: 是) + */ + @NotNull(message = "是否事故 (0: 否, 1: 是)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long isAccident; + + /** + * 响应级别 (0: 常规, 1: 紧急, 2: 特急) + */ + @NotBlank(message = "响应级别 (0: 常规, 1: 紧急, 2: 特急)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String responseLevel; + + /** + * 响应时限 + */ + @NotNull(message = "响应时限不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long responseTime; + + /** + * 故障大类 + */ + @NotBlank(message = "故障大类不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultCategory; + + /** + * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) + */ + @NotBlank(message = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultSubcategory; + + /** + * 所属机构 + */ + @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class }) + private String institution; + + /** + * 故障地点 + */ + @NotBlank(message = "故障地点不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultLocation; + + /** + * 故障描述 + */ + @NotBlank(message = "故障描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultDescription; + + /** + * 故障图片 + */ + @NotBlank(message = "故障图片不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultImage; + + /** + * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) + */ + @NotBlank(message = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintenanceRequirement; + + /** + * 派遣意见 + */ + @NotBlank(message = "派遣意见不能为空", groups = { AddGroup.class, EditGroup.class }) + private String dispatchOpinion; + + /** + * 是否派遣 (0: 否, 1: 是) + */ + @NotNull(message = "是否派遣 (0: 否, 1: 是)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long isDispatched; + + /** + * 纬度 + */ + @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class }) + private String latitude; + + /** + * 经度 + */ + @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class }) + private String longitude; + + /** + * 创建人 + */ + @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String creator; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java new file mode 100644 index 0000000..5eea449 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java @@ -0,0 +1,153 @@ +package org.dromara.platform.domain.vo; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.platform.domain.WorkOrderInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 工单信息视图对象 work_order_info + * + * @author gejunhao + * @date 2025-01-10 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WorkOrderInfo.class) +public class WorkOrderInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 工单ID + */ + @ExcelProperty(value = "工单ID") + private Long workOrderId; + + /** + * 所属项目 + */ + @ExcelProperty(value = "所属项目") + private String projectName; + + /** + * 报修人员 + */ + @ExcelProperty(value = "报修人员") + private String repairer; + + /** + * 保修人员ID + */ + @ExcelProperty(value = "保修人员ID") + private Long repairerId; + + /** + * 是否事故 (0: 否, 1: 是) + */ + @ExcelProperty(value = "是否事故 (0: 否, 1: 是)") + private Long isAccident; + + /** + * 响应级别 (0: 常规, 1: 紧急, 2: 特急) + */ + @ExcelProperty(value = "响应级别 (0: 常规, 1: 紧急, 2: 特急)") + private String responseLevel; + + /** + * 响应时限 + */ + @ExcelProperty(value = "响应时限") + private Long responseTime; + + /** + * 故障大类 + */ + @ExcelProperty(value = "故障大类") + private String faultCategory; + + /** + * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) + */ + @ExcelProperty(value = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)") + private String faultSubcategory; + + /** + * 所属机构 + */ + @ExcelProperty(value = "所属机构") + private String institution; + + /** + * 故障地点 + */ + @ExcelProperty(value = "故障地点") + private String faultLocation; + + /** + * 故障描述 + */ + @ExcelProperty(value = "故障描述") + private String faultDescription; + + /** + * 故障图片 + */ + @ExcelProperty(value = "故障图片") + private String faultImage; + + /** + * 故障图片Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "faultImage") + private String faultImageUrl; + /** + * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) + */ + @ExcelProperty(value = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)") + private String maintenanceRequirement; + + /** + * 派遣意见 + */ + @ExcelProperty(value = "派遣意见") + private String dispatchOpinion; + + /** + * 是否派遣 (0: 否, 1: 是) + */ + @ExcelProperty(value = "是否派遣 (0: 否, 1: 是)") + private Long isDispatched; + + /** + * 纬度 + */ + @ExcelProperty(value = "纬度") + private String latitude; + + /** + * 经度 + */ + @ExcelProperty(value = "经度") + private String longitude; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private String creator; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java index c83c9f0..f2452a7 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java @@ -5,7 +5,7 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; import lombok.extern.slf4j.Slf4j; -import org.dromara.platform.domain.entity.ProjectManager; +import org.dromara.platform.domain.ProjectManager; import org.dromara.platform.service.ProjectManagerService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java index d01b5af..3ec4036 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.ResultType; import org.apache.ibatis.annotations.Select; -import org.dromara.platform.domain.entity.ProjectManager; +import org.dromara.platform.domain.ProjectManager; import java.util.List; @@ -22,6 +22,13 @@ public interface ProjectManagerMapper extends BaseMapper { @Select("select * from project_manager") @ResultType(ProjectManager.class) List getDate(); + + /** + * xml写法 + * @return + */ + @ResultType(ProjectManager.class) + List selectAll(); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java new file mode 100644 index 0000000..a2ead8a --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.platform.domain.vo.WorkOrderInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工单信息Mapper接口 + * + * @author gejunhao + * @date 2025-01-10 + */ +public interface WorkOrderInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java new file mode 100644 index 0000000..2571181 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.WorkOrderInfoVo; +import org.dromara.platform.domain.bo.WorkOrderInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 工单信息Service接口 + * + * @author gejunhao + * @date 2025-01-10 + */ +public interface IWorkOrderInfoService { + + /** + * 查询工单信息 + * + * @param workOrderId 主键 + * @return 工单信息 + */ + WorkOrderInfoVo queryById(Long workOrderId); + + /** + * 分页查询工单信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单信息分页列表 + */ + TableDataInfo queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工单信息列表 + * + * @param bo 查询条件 + * @return 工单信息列表 + */ + List queryList(WorkOrderInfoBo bo); + + /** + * 新增工单信息 + * + * @param bo 工单信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WorkOrderInfoBo bo); + + /** + * 修改工单信息 + * + * @param bo 工单信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WorkOrderInfoBo bo); + + /** + * 校验并批量删除工单信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java index b5ac916..0c628ed 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java @@ -3,7 +3,7 @@ package org.dromara.platform.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.dromara.platform.domain.entity.ProjectManager; +import org.dromara.platform.domain.ProjectManager; import java.util.List; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java index 963226a..fdbc0a3 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java @@ -3,7 +3,7 @@ package org.dromara.platform.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import org.dromara.platform.domain.entity.ProjectManager; +import org.dromara.platform.domain.ProjectManager; import org.dromara.platform.mapper.ProjectManagerMapper; import org.dromara.platform.service.ProjectManagerService; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ public class ProjectManagerServiceImpl extends ServiceImpl getData() { - List projectManagers = projectManagerMapper.getDate(); + List projectManagers = projectManagerMapper.selectAll(); return projectManagers; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java new file mode 100644 index 0000000..0b3bebf --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -0,0 +1,146 @@ +package org.dromara.platform.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.platform.domain.bo.WorkOrderInfoBo; +import org.dromara.platform.domain.vo.WorkOrderInfoVo; +import org.dromara.platform.domain.WorkOrderInfo; +import org.dromara.platform.mapper.WorkOrderInfoMapper; +import org.dromara.platform.service.IWorkOrderInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工单信息Service业务层处理 + * + * @author gejunhao + * @date 2025-01-10 + */ +@RequiredArgsConstructor +@Service +public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { + + private final WorkOrderInfoMapper baseMapper; + + /** + * 查询工单信息 + * + * @param workOrderId 主键 + * @return 工单信息 + */ + @Override + public WorkOrderInfoVo queryById(Long workOrderId){ + return baseMapper.selectVoById(workOrderId); + } + + /** + * 分页查询工单信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工单信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的工单信息列表 + * + * @param bo 查询条件 + * @return 工单信息列表 + */ + @Override + public List queryList(WorkOrderInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WorkOrderInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), WorkOrderInfo::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getRepairer()), WorkOrderInfo::getRepairer, bo.getRepairer()); + lqw.eq(bo.getRepairerId() != null, WorkOrderInfo::getRepairerId, bo.getRepairerId()); + lqw.eq(bo.getIsAccident() != null, WorkOrderInfo::getIsAccident, bo.getIsAccident()); + lqw.eq(StringUtils.isNotBlank(bo.getResponseLevel()), WorkOrderInfo::getResponseLevel, bo.getResponseLevel()); + lqw.eq(bo.getResponseTime() != null, WorkOrderInfo::getResponseTime, bo.getResponseTime()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderInfo::getFaultCategory, bo.getFaultCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultSubcategory()), WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory()); + lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderInfo::getInstitution, bo.getInstitution()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderInfo::getFaultImage, bo.getFaultImage()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceRequirement()), WorkOrderInfo::getMaintenanceRequirement, bo.getMaintenanceRequirement()); + lqw.eq(StringUtils.isNotBlank(bo.getDispatchOpinion()), WorkOrderInfo::getDispatchOpinion, bo.getDispatchOpinion()); + lqw.eq(bo.getIsDispatched() != null, WorkOrderInfo::getIsDispatched, bo.getIsDispatched()); + lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude()); + lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude()); + lqw.eq(StringUtils.isNotBlank(bo.getCreator()), WorkOrderInfo::getCreator, bo.getCreator()); + return lqw; + } + + /** + * 新增工单信息 + * + * @param bo 工单信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WorkOrderInfoBo bo) { + WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setWorkOrderId(add.getWorkOrderId()); + } + return flag; + } + + /** + * 修改工单信息 + * + * @param bo 工单信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WorkOrderInfoBo bo) { + WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WorkOrderInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除工单信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml b/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml new file mode 100644 index 0000000..c4d92b1 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml deleted file mode 100644 index dbf89a3..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -