Merge branch 'refs/heads/dev' into updateMenu

xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml

@@ -41,7 +41,7 @@ spring:
       api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa
       chat:
         options:
-          model: qwen-plus
+          model: qwen3-max
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@@ -66,7 +66,7 @@ spring:
           #          username: xinnengyuan
           #          password: mEZPC5Sdf3r2HENi
           # 从库数据源
-#        slave:
+      #        slave:
       #          lazy: true
       #          type: ${spring.datasource.type}
       #          driverClassName: com.mysql.cj.jdbc.Driver

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -109,7 +109,7 @@ sa-token:
   # token有效期，单位s 默认30天, -1代表永不过期
   timeout: 2592000
   # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  active-timeout: 86400
+  active-timeout: 2592000
   # 同一账号最大登录数量，-1代表不限
   max-login-count: -1
 
@@ -305,6 +305,10 @@ springdoc:
       packages-to-scan: org.dromara.ai
     - group: 31.投标管理模块
       packages-to-scan: org.dromara.bidding
+    - group: 33.机械模块
+      packages-to-scan: org.dromara.mechanical.jxgl
+    - group: 32.设备模块
+      packages-to-scan: org.dromara.device
 # knife4j的增强配置，不需要增强可以不配
 knife4j:
   enable: true

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java

@@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture;
 public class DashScopeChat {
 
     @Resource
-    private SimpleChat simpleChat;
+    private DashScopeSimpleChat dashScopeSimpleChat;
 
     @Resource
     private IAIChatMemoryService chatMemoryService;
@@ -66,10 +66,8 @@ public class DashScopeChat {
             .collectList()
             .flatMapMany(tokens -> {
                 String aiResponse = String.join("", tokens);
-                if (isFirst) {
                 // 异步生成标题
                 generateChatTitleAsync(chatId, message, aiResponse, userId);
-                }
                 // 返回完整的流结果
                 return Flux.fromIterable(tokens);
             });
@@ -100,7 +98,7 @@ public class DashScopeChat {
                     用户：%s
                     AI：%s
                     """, userMessage, aiResponse);
-                String title = simpleChat.doChat(prompt);
+                String title = dashScopeSimpleChat.doChat(prompt);
                 log.info("用户：{} 生成标题成功：{} -> {}", userId, chatId, title);
                 // 保存对话数据
                 AIChatMemory memory = new AIChatMemory();

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeSimpleChat.java

@@ -9,11 +9,11 @@ import org.springframework.stereotype.Component;
  * @date 2025-11-04 15:26
  */
 @Component
-public class SimpleChat {
+public class DashScopeSimpleChat {
 
     private final ChatClient dashScopeChatClient;
 
-    public SimpleChat(ChatClient.Builder chatClientBuilder) {
+    public DashScopeSimpleChat(ChatClient.Builder chatClientBuilder) {
         this.dashScopeChatClient = chatClientBuilder
             // 设置 ChatClient 中 ChatModel 的 Options 参数
             .defaultOptions(

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java

@@ -41,7 +41,6 @@ import org.dromara.patch.service.IPdMasterService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.system.domain.SysMenu;
 import org.dromara.system.domain.vo.RouterVo;
-import org.dromara.system.mapper.SysRoleMapper;
 import org.dromara.system.service.impl.SysMenuServiceImpl;
 import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.dromara.warm.flow.core.FlowEngine;
@@ -97,7 +96,6 @@ public class PersonalHomeController extends BaseController {
     @Resource
     private IBusProjectService projectService;
 
-    private final SysRoleMapper roleMapper;
     private final SysMenuServiceImpl sysMenuService;
 
     // region AI 模块

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/controller/AppBusComplaintBoxController.java

@@ -0,0 +1,106 @@
+package org.dromara.complaintBox.app.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo;
+import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService;
+import org.dromara.complaintBox.service.IBusComplaintBoxService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 意见箱
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/complaintBox/complaintBox")
+public class AppBusComplaintBoxController extends BaseController {
+
+    @Lazy
+    private final IBusComplaintBoxService busComplaintBoxService;
+    @Lazy
+    private final IBusComplaintBoxMessageLoggingService busComplaintBoxMessageLoggingService;
+
+
+    /**
+     * 查询意见箱列表
+     */
+//    @SaCheckPermission("appComplaintBox:complaintBox:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusComplaintBoxVo> list(BusComplaintBoxBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser != null) {
+            bo.setUserId(loginUser.getUserId());
+        }
+        return busComplaintBoxService.appQueryPageList(bo, pageQuery);
+    }
+
+
+
+    /**
+     * 获取意见箱详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("appComplaintBox:complaintBox:query")
+    @GetMapping("/{id}")
+    public R<AppDetailsOfTheOpinionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busComplaintBoxService.appQueryById(id));
+    }
+
+    /**
+     * 新增意见箱
+     */
+//    @SaCheckPermission("appComplaintBox:complaintBox:add")
+    @Log(title = "意见箱", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BusComplaintBoxBo bo) {
+        return toAjax(busComplaintBoxService.insertByBo(bo));
+    }
+
+
+    /**
+     * 新增意见回复
+     */
+//    @SaCheckPermission("appComplaintBox:complaintBox:add")
+    @Log(title = "意见箱", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/postAReply")
+    public R<Void> postAReply(@Validated(AddGroup.class) @RequestBody BusComplaintBoxMessageLoggingBo bo) {
+        return toAjax(busComplaintBoxMessageLoggingService.insertAppByBo(bo));
+    }
+
+    /**
+     * 修改意见阅读状态
+     */
+//    @SaCheckPermission("appComplaintBox:complaintBox:edit")
+    @Log(title = "意见箱", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/editCheckStatus")
+    public R<Void> editCheckStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) {
+        return toAjax(busComplaintBoxService.editCheckStatus(bo));
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/domain/vo/AppDetailsOfTheOpinionVo.java

@@ -0,0 +1,16 @@
+package org.dromara.complaintBox.app.domain.vo;
+
+import lombok.Data;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class AppDetailsOfTheOpinionVo implements Serializable {
+
+    private BusComplaintBoxVo busComplaintBoxVo;
+
+    private List<BusComplaintBoxMessageLoggingVo> messageLoggingVos;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/controller/BusComplaintBoxController.java

@@ -0,0 +1,109 @@
+package org.dromara.complaintBox.controller;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo;
+import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo;
+import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo;
+import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService;
+import org.springframework.context.annotation.Lazy;
+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.complaintBox.domain.vo.BusComplaintBoxVo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo;
+import org.dromara.complaintBox.service.IBusComplaintBoxService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 意见箱
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/complaintBox/complaintBox")
+public class BusComplaintBoxController extends BaseController {
+
+    @Lazy
+    private final IBusComplaintBoxService busComplaintBoxService;
+    @Lazy
+    private final IBusComplaintBoxMessageLoggingService busComplaintBoxMessageLoggingService;
+
+
+    /**
+     * 查询意见箱列表
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusComplaintBoxVo> list(BusComplaintBoxBo bo, PageQuery pageQuery) {
+        return busComplaintBoxService.queryPageList(bo, pageQuery);
+    }
+    /**
+     * web获取各个处理状态数量
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:list")
+    @GetMapping("/getCount")
+    public R<List<ComplaintBoxCountVo>> getCount(BusComplaintBoxBo bo) {
+        return R.ok(busComplaintBoxService.getCount(bo));
+    }
+
+    /**
+     * 获取意见箱详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:query")
+    @GetMapping("/{id}")
+    public R<DetailsOfTheOpinionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busComplaintBoxService.getInfo(id));
+    }
+
+    /**
+     * 新增意见回复
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:add")
+    @Log(title = "意见箱", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/postAReply")
+    public R<Void> postAReply(@Validated(AddGroup.class) @RequestBody BusComplaintBoxMessageLoggingBo bo) {
+        return toAjax(busComplaintBoxMessageLoggingService.insertWebByBo(bo));
+    }
+
+
+    /**
+     * 修改意见阅读状态
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:edit")
+    @Log(title = "意见箱", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/editCheckStatus")
+    public R<Void> editCheckStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) {
+        return toAjax(busComplaintBoxService.editCheckStatus(bo));
+    }
+
+    /**
+     * 修改意见阅读状态
+     */
+//    @SaCheckPermission("complaintBox:complaintBox:edit")
+    @Log(title = "意见箱", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/editStatus")
+    public R<Void> editStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) {
+        return toAjax(busComplaintBoxService.editStatus(bo));
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBox.java

@@ -0,0 +1,91 @@
+package org.dromara.complaintBox.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 意见箱对象 bus_complaint_box
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_complaint_box")
+public class BusComplaintBox extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 公司id（当前登录人的顶层下一级部门id）
+     */
+    private Long companyId;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见）
+     */
+    private String opinionType;
+
+    /**
+     * 详细描述
+     */
+    private String detail;
+
+    /**
+     * 上传图片（id，id之间使用','分割）
+     */
+    private String fileId;
+
+    /**
+     * 是否匿名提交（0、否，1、是）
+     */
+    private String isCryptonym;
+
+    /**
+     * 处理状态（0、待处理，5、处理中，9、已解决，10、退回，14、关闭）
+     */
+    private String status;
+
+    /**
+     * 当前处理人id
+     */
+    private Long currentDisposeUserId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxDisposeLogging.java

@@ -0,0 +1,61 @@
+package org.dromara.complaintBox.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 意见箱-意见处理记录对象 bus_complaint_box_dispose_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_complaint_box_dispose_logging")
+public class BusComplaintBoxDisposeLogging extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    private Long complaintId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 是否退回（0、否，1、是）
+     */
+    private String isRefund;
+
+    /**
+     * 退回原因
+     */
+    private String cause;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxMessageLogging.java

@@ -0,0 +1,76 @@
+package org.dromara.complaintBox.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 意见箱-意见沟通记录对象 bus_complaint_box_message_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("bus_complaint_box_message_logging")
+public class BusComplaintBoxMessageLogging extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    private Long complaintId;
+
+    /**
+     * 回复用户id
+     */
+    private Long replyUserId;
+
+    /**
+     * 回复用户名
+     */
+    private String replyUserName;
+
+    /**
+     * 回复用户头像地址
+     */
+    private Long replyAvatar;
+
+    /**
+     * 被回复用户id
+     */
+    private Long repliedUserId;
+
+    /**
+     * 被回复用户名
+     */
+    private String repliedUserName;
+
+    /**
+     * 被回复用户头像地址
+     */
+    private Long repliedAvatar;
+
+    /**
+     * 消息内容
+     */
+    private String details;
+
+    /**
+     * 处理状态（0、未读，1、已读）
+     */
+    private String status;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxBo.java

@@ -0,0 +1,90 @@
+package org.dromara.complaintBox.domain.bo;
+
+import org.dromara.complaintBox.domain.BusComplaintBox;
+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.*;
+
+/**
+ * 意见箱业务对象 bus_complaint_box
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BusComplaintBox.class, reverseConvertGenerate = false)
+public class BusComplaintBoxBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 公司id（当前登录人的顶层下一级部门id）
+     */
+    private Long companyId;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "主键ID不能为空", groups = { AddGroup.class })
+    private Long userId;
+    /**
+     * 当前处理人id
+     */
+    private Long currentDisposeUserId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见）
+     */
+    private String opinionType;
+
+    /**
+     * 详细描述
+     */
+    private String detail;
+
+    /**
+     * 上传图片（id，id之间使用','分割）
+     */
+    private String fileId;
+
+    /**
+     * 是否匿名提交（0、否，1、是）
+     */
+    private String isCryptonym;
+
+    /**
+     * 处理状态（0、待处理，5、处理中，9、已解决，14、关闭）
+     */
+    private String status;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxDisposeLoggingBo.java

@@ -0,0 +1,60 @@
+package org.dromara.complaintBox.domain.bo;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging;
+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.*;
+
+/**
+ * 意见箱-意见处理记录业务对象 bus_complaint_box_dispose_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BusComplaintBoxDisposeLogging.class, reverseConvertGenerate = false)
+public class BusComplaintBoxDisposeLoggingBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    private Long complaintId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 是否退回（0、否，1、是）
+     */
+    private String isRefund;
+
+    /**
+     * 退回原因
+     */
+    private String cause;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxMessageLoggingBo.java

@@ -0,0 +1,80 @@
+package org.dromara.complaintBox.domain.bo;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+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.*;
+
+/**
+ * 意见箱-意见沟通记录业务对象 bus_complaint_box_message_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BusComplaintBoxMessageLogging.class, reverseConvertGenerate = false)
+public class BusComplaintBoxMessageLoggingBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    private Long complaintId;
+
+    /**
+     * 回复用户id
+     */
+    private Long replyUserId;
+
+    /**
+     * 回复用户名
+     */
+    private String replyUserName;
+
+    /**
+     * 回复用户头像地址
+     */
+    private Long replyAvatar;
+
+    /**
+     * 被回复用户id
+     */
+    private Long repliedUserId;
+
+    /**
+     * 被回复用户名
+     */
+    private String repliedUserName;
+
+    /**
+     * 被回复用户头像地址
+     */
+    private Long repliedAvatar;
+
+    /**
+     * 消息内容
+     */
+    private String details;
+
+    /**
+     * 处理状态（0、未读，1、已读）
+     */
+    private String status;
+
+    /**
+     * 上一条沟通记录id
+     */
+    private Long oldId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxDisposeLoggingVo.java

@@ -0,0 +1,75 @@
+package org.dromara.complaintBox.domain.vo;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging;
+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;
+
+
+
+/**
+ * 意见箱-意见处理记录视图对象 bus_complaint_box_dispose_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = BusComplaintBoxDisposeLogging.class)
+public class BusComplaintBoxDisposeLoggingVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    @ExcelProperty(value = "意见id")
+    private Long complaintId;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = "用户名")
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    @ExcelProperty(value = "头像地址")
+    private Long avatar;
+
+    /**
+     * 是否退回（0、否，1、是）
+     */
+    @ExcelProperty(value = "是否退回", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=、否，1、是")
+    private String isRefund;
+
+    /**
+     * 退回原因
+     */
+    @ExcelProperty(value = "退回原因")
+    private String cause;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxMessageLoggingVo.java

@@ -0,0 +1,99 @@
+package org.dromara.complaintBox.domain.vo;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+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;
+
+
+
+/**
+ * 意见箱-意见沟通记录视图对象 bus_complaint_box_message_logging
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = BusComplaintBoxMessageLogging.class)
+public class BusComplaintBoxMessageLoggingVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 意见id
+     */
+    @ExcelProperty(value = "意见id")
+    private Long complaintId;
+
+    /**
+     * 回复用户id
+     */
+    private Long replyUserId;
+
+    /**
+     * 回复用户名
+     */
+    private String replyUserName;
+
+    /**
+     * 回复用户头像地址
+     */
+    private Long replyAvatar;
+    private String replyAvatarUrl;
+
+    /**
+     * 被回复用户id
+     */
+    private Long repliedUserId;
+
+    /**
+     * 被回复用户名
+     */
+    private String repliedUserName;
+
+    /**
+     * 被回复用户头像地址
+     */
+    private Long repliedAvatar;
+    private String repliedAvatarUrl;
+
+    /**
+     * 消息内容
+     */
+    @ExcelProperty(value = "消息内容")
+    private String details;
+
+    /**
+     * 处理状态（0、未读，1、已读）
+     */
+    @ExcelProperty(value = "处理状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=、未读，1、已读")
+    private String status;
+
+    /**
+     * 发起人类型（0、发起人，1、处理人）
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxVo.java

@@ -0,0 +1,125 @@
+package org.dromara.complaintBox.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import org.dromara.complaintBox.domain.BusComplaintBox;
+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;
+import java.util.List;
+
+
+/**
+ * 意见箱视图对象 bus_complaint_box
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = BusComplaintBox.class)
+public class BusComplaintBoxVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 公司id（当前登录人的顶层下一级部门id）
+     */
+    @ExcelProperty(value = "公司id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "当=前登录人的顶层下一级部门id")
+    private Long companyId;
+
+    /**
+     * 项目id
+     */
+    @ExcelProperty(value = "项目id")
+    private Long projectId;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = "用户名")
+    private String userName;
+
+    /**
+     * 头像地址
+     */
+    @ExcelProperty(value = "头像地址")
+    private Long avatar;
+    private String avatarUrl;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见）
+     */
+    @ExcelProperty(value = "意见类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=、功能建议，2、Bug反馈，3、体验问题，4其他意见")
+    private String opinionType;
+
+    /**
+     * 详细描述
+     */
+    @ExcelProperty(value = "详细描述")
+    private String detail;
+
+    /**
+     * 上传图片（id，id之间使用','分割）
+     */
+    @ExcelProperty(value = "上传图片", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "i=d，id之间使用','分割")
+    private String fileId;
+    private List<String> fileUrls;
+
+    /**
+     * 是否匿名提交（0、否，1、是）
+     */
+    @ExcelProperty(value = "是否匿名提交", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=、否，1、是")
+    private String isCryptonym;
+
+    /**
+     * 处理状态（0、待处理，5、处理中，9、已解决，14、关闭）
+     */
+    @ExcelProperty(value = "处理状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=、待处理，5、处理中，9、已解决，14、关闭")
+    private String status;
+
+    /**
+     * 当前处理人id
+     */
+    private Long currentDisposeUserId;
+
+    private Integer count;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/ComplaintBoxCountVo.java

@@ -0,0 +1,18 @@
+package org.dromara.complaintBox.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serializable;
+
+@Data
+public class ComplaintBoxCountVo implements Serializable {
+
+    private String type;
+
+//    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "type",other = "opinion_processing_status")
+    private String typeName;
+
+    private Integer count;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/DetailsOfTheOpinionVo.java

@@ -0,0 +1,14 @@
+package org.dromara.complaintBox.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DetailsOfTheOpinionVo implements Serializable {
+
+    private BusComplaintBoxVo busComplaintBoxVo;
+
+    private List<BusComplaintBoxMessageLoggingVo> messageLoggingVos;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxDisposeLoggingMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.complaintBox.mapper;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 意见箱-意见处理记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface BusComplaintBoxDisposeLoggingMapper extends BaseMapperPlus<BusComplaintBoxDisposeLogging, BusComplaintBoxDisposeLoggingVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMapper.java

@@ -0,0 +1,26 @@
+package org.dromara.complaintBox.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.complaintBox.domain.BusComplaintBox;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo;
+
+import java.util.List;
+
+/**
+ * 意见箱Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface BusComplaintBoxMapper extends BaseMapperPlus<BusComplaintBox, BusComplaintBoxVo> {
+
+    Page<BusComplaintBoxVo> selectVoPageList(@Param("page") Page<BusComplaintBoxVo> page, @Param("bo") BusComplaintBoxBo bo);
+
+    Page<BusComplaintBoxVo> selectVoPageWebList(@Param("page") Page<BusComplaintBoxVo> page, @Param("bo") BusComplaintBoxBo bo);
+
+    List<ComplaintBoxCountVo> getCount(@Param("bo") BusComplaintBoxBo bo);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMessageLoggingMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.complaintBox.mapper;
+
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 意见箱-意见沟通记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface BusComplaintBoxMessageLoggingMapper extends BaseMapperPlus<BusComplaintBoxMessageLogging, BusComplaintBoxMessageLoggingVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxDisposeLoggingService.java

@@ -0,0 +1,70 @@
+package org.dromara.complaintBox.service;
+
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxDisposeLoggingBo;
+import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 意见箱-意见处理记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface IBusComplaintBoxDisposeLoggingService extends IService<BusComplaintBoxDisposeLogging>{
+
+    /**
+     * 查询意见箱-意见处理记录
+     *
+     * @param id 主键
+     * @return 意见箱-意见处理记录
+     */
+    BusComplaintBoxDisposeLoggingVo queryById(Long id);
+
+    /**
+     * 分页查询意见箱-意见处理记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱-意见处理记录分页列表
+     */
+    TableDataInfo<BusComplaintBoxDisposeLoggingVo> queryPageList(BusComplaintBoxDisposeLoggingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的意见箱-意见处理记录列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱-意见处理记录列表
+     */
+    List<BusComplaintBoxDisposeLoggingVo> queryList(BusComplaintBoxDisposeLoggingBo bo);
+
+    /**
+     * 新增意见箱-意见处理记录
+     *
+     * @param bo 意见箱-意见处理记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(BusComplaintBoxDisposeLoggingBo bo);
+
+    /**
+     * 修改意见箱-意见处理记录
+     *
+     * @param bo 意见箱-意见处理记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(BusComplaintBoxDisposeLoggingBo bo);
+
+    /**
+     * 校验并批量删除意见箱-意见处理记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxMessageLoggingService.java

@@ -0,0 +1,84 @@
+package org.dromara.complaintBox.service;
+
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo;
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 意见箱-意见沟通记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface IBusComplaintBoxMessageLoggingService extends IService<BusComplaintBoxMessageLogging>{
+
+    /**
+     * 查询意见箱-意见沟通记录
+     *
+     * @param id 主键
+     * @return 意见箱-意见沟通记录
+     */
+    BusComplaintBoxMessageLoggingVo queryById(Long id);
+
+    /**
+     * 分页查询意见箱-意见沟通记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱-意见沟通记录分页列表
+     */
+    TableDataInfo<BusComplaintBoxMessageLoggingVo> queryPageList(BusComplaintBoxMessageLoggingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的意见箱-意见沟通记录列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱-意见沟通记录列表
+     */
+    List<BusComplaintBoxMessageLoggingVo> queryList(BusComplaintBoxMessageLoggingBo bo);
+
+    /**
+     * 新增意见箱-意见沟通记录
+     *
+     * @param bo 意见箱-意见沟通记录
+     * @return 是否新增成功
+     */
+    Boolean insertAppByBo(BusComplaintBoxMessageLoggingBo bo);
+    /**
+     * 新增意见箱-意见沟通记录
+     *
+     * @param bo 意见箱-意见沟通记录
+     * @return 是否新增成功
+     */
+    Boolean insertWebByBo(BusComplaintBoxMessageLoggingBo bo);
+
+    /**
+     * 修改意见箱-意见沟通记录
+     *
+     * @param bo 意见箱-意见沟通记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(BusComplaintBoxMessageLoggingBo bo);
+
+    /**
+     * 校验并批量删除意见箱-意见沟通记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 通过意见id获取沟通记录
+     * @param id
+     * @return
+     */
+    List<BusComplaintBoxMessageLoggingVo> getMessageLogListByComplaintId(Long id);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxService.java

@@ -0,0 +1,117 @@
+package org.dromara.complaintBox.service;
+
+import org.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo;
+import org.dromara.complaintBox.domain.BusComplaintBox;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo;
+import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 意见箱Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+public interface IBusComplaintBoxService extends IService<BusComplaintBox>{
+
+    /**
+     * 查询意见箱
+     *
+     * @param id 主键
+     * @return 意见箱
+     */
+    BusComplaintBoxVo queryById(Long id);
+
+    /**
+     * 分页查询意见箱列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱分页列表
+     */
+    TableDataInfo<BusComplaintBoxVo> queryPageList(BusComplaintBoxBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的意见箱列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱列表
+     */
+    List<BusComplaintBoxVo> queryList(BusComplaintBoxBo bo);
+
+    /**
+     * 新增意见箱
+     *
+     * @param bo 意见箱
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(BusComplaintBoxBo bo);
+
+    /**
+     * 修改意见箱
+     *
+     * @param bo 意见箱
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(BusComplaintBoxBo bo);
+
+    /**
+     * 校验并批量删除意见箱信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * app获取当前用户提出意见列表
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    TableDataInfo<BusComplaintBoxVo> appQueryPageList(BusComplaintBoxBo bo, PageQuery pageQuery);
+
+    /**
+     * APP获取当前意见详情
+     * @param id
+     * @return
+     */
+    AppDetailsOfTheOpinionVo appQueryById(Long id);
+
+    /**
+     * 获取当前意见详情
+     * @param id
+     * @return
+     */
+    DetailsOfTheOpinionVo getInfo(Long id);
+
+    /**
+     * 修改沟通记录阅读状态
+     * @param bo
+     * @return
+     */
+    int editCheckStatus(BusComplaintBoxBo bo);
+
+    /**
+     * web获取各个处理状态数量
+     * @param bo
+     * @return
+     */
+    List<ComplaintBoxCountVo> getCount(BusComplaintBoxBo bo);
+
+    /**
+     * 修改意见状态
+     * @param bo
+     * @return
+     */
+    int editStatus(BusComplaintBoxBo bo);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxDisposeLoggingServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.complaintBox.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.complaintBox.domain.bo.BusComplaintBoxDisposeLoggingBo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo;
+import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging;
+import org.dromara.complaintBox.mapper.BusComplaintBoxDisposeLoggingMapper;
+import org.dromara.complaintBox.service.IBusComplaintBoxDisposeLoggingService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 意见箱-意见处理记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@RequiredArgsConstructor
+@Service
+public class BusComplaintBoxDisposeLoggingServiceImpl extends ServiceImpl<BusComplaintBoxDisposeLoggingMapper, BusComplaintBoxDisposeLogging> implements IBusComplaintBoxDisposeLoggingService {
+
+    private final BusComplaintBoxDisposeLoggingMapper baseMapper;
+
+    /**
+     * 查询意见箱-意见处理记录
+     *
+     * @param id 主键
+     * @return 意见箱-意见处理记录
+     */
+    @Override
+    public BusComplaintBoxDisposeLoggingVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询意见箱-意见处理记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱-意见处理记录分页列表
+     */
+    @Override
+    public TableDataInfo<BusComplaintBoxDisposeLoggingVo> queryPageList(BusComplaintBoxDisposeLoggingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<BusComplaintBoxDisposeLogging> lqw = buildQueryWrapper(bo);
+        Page<BusComplaintBoxDisposeLoggingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的意见箱-意见处理记录列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱-意见处理记录列表
+     */
+    @Override
+    public List<BusComplaintBoxDisposeLoggingVo> queryList(BusComplaintBoxDisposeLoggingBo bo) {
+        LambdaQueryWrapper<BusComplaintBoxDisposeLogging> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<BusComplaintBoxDisposeLogging> buildQueryWrapper(BusComplaintBoxDisposeLoggingBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<BusComplaintBoxDisposeLogging> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(BusComplaintBoxDisposeLogging::getId);
+        lqw.eq(bo.getComplaintId() != null, BusComplaintBoxDisposeLogging::getComplaintId, bo.getComplaintId());
+        lqw.eq(bo.getUserId() != null, BusComplaintBoxDisposeLogging::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getUserName()), BusComplaintBoxDisposeLogging::getUserName, bo.getUserName());
+        lqw.eq(bo.getAvatar() != null, BusComplaintBoxDisposeLogging::getAvatar, bo.getAvatar());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsRefund()), BusComplaintBoxDisposeLogging::getIsRefund, bo.getIsRefund());
+        lqw.eq(StringUtils.isNotBlank(bo.getCause()), BusComplaintBoxDisposeLogging::getCause, bo.getCause());
+        return lqw;
+    }
+
+    /**
+     * 新增意见箱-意见处理记录
+     *
+     * @param bo 意见箱-意见处理记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(BusComplaintBoxDisposeLoggingBo bo) {
+        BusComplaintBoxDisposeLogging add = MapstructUtils.convert(bo, BusComplaintBoxDisposeLogging.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改意见箱-意见处理记录
+     *
+     * @param bo 意见箱-意见处理记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(BusComplaintBoxDisposeLoggingBo bo) {
+        BusComplaintBoxDisposeLogging update = MapstructUtils.convert(bo, BusComplaintBoxDisposeLogging.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(BusComplaintBoxDisposeLogging entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除意见箱-意见处理记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxMessageLoggingServiceImpl.java

@@ -0,0 +1,217 @@
+package org.dromara.complaintBox.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+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.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.complaintBox.domain.BusComplaintBox;
+import org.dromara.complaintBox.mapper.BusComplaintBoxMapper;
+import org.dromara.complaintBox.service.IBusComplaintBoxService;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.ISysUserService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo;
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+import org.dromara.complaintBox.mapper.BusComplaintBoxMessageLoggingMapper;
+import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 意见箱-意见沟通记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@RequiredArgsConstructor
+@Service
+public class BusComplaintBoxMessageLoggingServiceImpl extends ServiceImpl<BusComplaintBoxMessageLoggingMapper, BusComplaintBoxMessageLogging> implements IBusComplaintBoxMessageLoggingService {
+
+    private final BusComplaintBoxMessageLoggingMapper baseMapper;
+    @Lazy
+    private final ISysUserService sysUserService;
+//    @Lazy
+    private final BusComplaintBoxMapper busComplaintBoxMapper;
+
+    /**
+     * 查询意见箱-意见沟通记录
+     *
+     * @param id 主键
+     * @return 意见箱-意见沟通记录
+     */
+    @Override
+    public BusComplaintBoxMessageLoggingVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询意见箱-意见沟通记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱-意见沟通记录分页列表
+     */
+    @Override
+    public TableDataInfo<BusComplaintBoxMessageLoggingVo> queryPageList(BusComplaintBoxMessageLoggingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<BusComplaintBoxMessageLogging> lqw = buildQueryWrapper(bo);
+        Page<BusComplaintBoxMessageLoggingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的意见箱-意见沟通记录列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱-意见沟通记录列表
+     */
+    @Override
+    public List<BusComplaintBoxMessageLoggingVo> queryList(BusComplaintBoxMessageLoggingBo bo) {
+        LambdaQueryWrapper<BusComplaintBoxMessageLogging> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<BusComplaintBoxMessageLogging> buildQueryWrapper(BusComplaintBoxMessageLoggingBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<BusComplaintBoxMessageLogging> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(BusComplaintBoxMessageLogging::getId);
+        lqw.eq(bo.getComplaintId() != null, BusComplaintBoxMessageLogging::getComplaintId, bo.getComplaintId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDetails()), BusComplaintBoxMessageLogging::getDetails, bo.getDetails());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusComplaintBoxMessageLogging::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增意见箱-意见沟通记录
+     *
+     * @param bo 意见箱-意见沟通记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertAppByBo(BusComplaintBoxMessageLoggingBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("登录信息出错，请重新登录！！！");
+        }
+        BusComplaintBox busComplaintBox = busComplaintBoxMapper.selectById(bo.getComplaintId());
+        if (busComplaintBox == null) {
+            throw new ServiceException("意见信息找不到！！！");
+        }
+        if ("14".equals(busComplaintBox.getStatus())){
+            throw new ServiceException("意见已关闭！！！");
+        }
+        SysUserVo sysUserVo = sysUserService.selectUserById(loginUser.getUserId());
+        bo.setReplyUserId(sysUserVo.getUserId());
+        bo.setReplyUserName(sysUserVo.getNickName());
+        bo.setReplyAvatar(sysUserVo.getAvatar());
+        BusComplaintBoxMessageLogging add = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class);
+        if (busComplaintBox.getCurrentDisposeUserId() != null) {
+            SysUserVo userVo = sysUserService.selectUserById(busComplaintBox.getCurrentDisposeUserId());
+            if (userVo != null) {
+                add.setRepliedUserId(userVo.getUserId());
+                add.setRepliedUserName(userVo.getUserName());
+                add.setRepliedAvatar(userVo.getAvatar());
+            }
+        }
+
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertWebByBo(BusComplaintBoxMessageLoggingBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (loginUser == null) {
+            throw new ServiceException("登录信息出错，请重新登录！！！");
+        }
+        BusComplaintBox busComplaintBox = busComplaintBoxMapper.selectById(bo.getComplaintId());
+        if (busComplaintBox == null) {
+            throw new ServiceException("意见信息找不到！！！");
+        }
+        if ("14".equals(busComplaintBox.getStatus())){
+            throw new ServiceException("意见已关闭！！！");
+        }
+        SysUserVo sysUserVo = sysUserService.selectUserById(loginUser.getUserId());
+        bo.setReplyUserId(sysUserVo.getUserId());
+        bo.setReplyUserName(sysUserVo.getNickName());
+        bo.setReplyAvatar(sysUserVo.getAvatar());
+        BusComplaintBoxMessageLogging add = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class);
+        add.setRepliedUserId(busComplaintBox.getUserId());
+        add.setRepliedUserName(busComplaintBox.getUserName());
+        add.setRepliedAvatar(busComplaintBox.getAvatar());
+
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if ("0".equals(busComplaintBox.getStatus())){
+            busComplaintBox.setStatus("5");
+            busComplaintBox.setCurrentDisposeUserId(sysUserVo.getUserId());
+            busComplaintBoxMapper.updateById(busComplaintBox);
+        }
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改意见箱-意见沟通记录
+     *
+     * @param bo 意见箱-意见沟通记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(BusComplaintBoxMessageLoggingBo bo) {
+        BusComplaintBoxMessageLogging update = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(BusComplaintBoxMessageLogging entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除意见箱-意见沟通记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据意见id获取沟通记录
+     * @param id
+     * @return
+     */
+    @Override
+    public List<BusComplaintBoxMessageLoggingVo> getMessageLogListByComplaintId(Long id) {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<BusComplaintBoxMessageLogging>().eq(BusComplaintBoxMessageLogging::getComplaintId, id));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxServiceImpl.java

@@ -0,0 +1,333 @@
+package org.dromara.complaintBox.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
+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.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo;
+import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo;
+import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo;
+import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo;
+import org.dromara.complaintBox.mapper.BusComplaintBoxMessageLoggingMapper;
+import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.ISysDeptService;
+import org.dromara.system.service.ISysOssService;
+import org.dromara.system.service.ISysUserService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo;
+import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo;
+import org.dromara.complaintBox.domain.BusComplaintBox;
+import org.dromara.complaintBox.mapper.BusComplaintBoxMapper;
+import org.dromara.complaintBox.service.IBusComplaintBoxService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 意见箱Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-11-29
+ */
+@RequiredArgsConstructor
+@Service
+public class BusComplaintBoxServiceImpl extends ServiceImpl<BusComplaintBoxMapper, BusComplaintBox> implements IBusComplaintBoxService {
+
+    private final BusComplaintBoxMapper baseMapper;
+//    @Lazy
+    private final BusComplaintBoxMessageLoggingMapper messageLoggingMapper;
+    @Lazy
+    private final ISysUserService sysUserService;
+    @Lazy
+    private final ISysDeptService sysDeptService;
+    @Lazy
+    private final ISysOssService sysOssService;
+
+    /**
+     * 查询意见箱
+     *
+     * @param id 主键
+     * @return 意见箱
+     */
+    @Override
+    public BusComplaintBoxVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询意见箱列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 意见箱分页列表
+     */
+    @Override
+    public TableDataInfo<BusComplaintBoxVo> queryPageList(BusComplaintBoxBo bo, PageQuery pageQuery) {
+        Page<BusComplaintBoxVo> result = baseMapper.selectVoPageWebList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的意见箱列表
+     *
+     * @param bo 查询条件
+     * @return 意见箱列表
+     */
+    @Override
+    public List<BusComplaintBoxVo> queryList(BusComplaintBoxBo bo) {
+        LambdaQueryWrapper<BusComplaintBox> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<BusComplaintBox> buildQueryWrapper(BusComplaintBoxBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<BusComplaintBox> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(BusComplaintBox::getId);
+        lqw.eq(bo.getCompanyId() != null, BusComplaintBox::getCompanyId, bo.getCompanyId());
+        lqw.eq(bo.getProjectId() != null, BusComplaintBox::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getUserId() != null, BusComplaintBox::getUserId, bo.getUserId());
+        lqw.eq(bo.getCurrentDisposeUserId() != null,
+                BusComplaintBox::getCurrentDisposeUserId, bo.getCurrentDisposeUserId())
+            .or()
+            .isNull(BusComplaintBox::getCurrentDisposeUserId);
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), BusComplaintBox::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpinionType()), BusComplaintBox::getOpinionType, bo.getOpinionType());
+        lqw.eq(StringUtils.isNotBlank(bo.getDetail()), BusComplaintBox::getDetail, bo.getDetail());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileId()), BusComplaintBox::getFileId, bo.getFileId());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsCryptonym()), BusComplaintBox::getIsCryptonym, bo.getIsCryptonym());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusComplaintBox::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增意见箱
+     *
+     * @param bo 意见箱
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(BusComplaintBoxBo bo) {
+        BusComplaintBox add = MapstructUtils.convert(bo, BusComplaintBox.class);
+        //获取用户信息进行填充
+        SysUserVo sysUserVo = sysUserService.selectUserById(add.getUserId());
+        add.setAvatar(sysUserVo.getAvatar());
+        add.setUserName(sysUserVo.getNickName());
+        //获取部门信息
+        SysDeptVo sysDeptVo =sysDeptService.selectDeptById(sysUserVo.getDeptId());
+        if (sysDeptVo != null) {
+            String[] split = sysDeptVo.getAncestors().split(",");
+            if (split.length > 0) {
+                //当祖级列表长度大于3时取第2个作为公司id
+                if (split.length > 1) {
+                    add.setCompanyId(Long.parseLong(split[1]));
+                }else  {
+                    add.setCompanyId(Long.parseLong(split[0]));
+                }
+            }
+        }
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改意见箱
+     *
+     * @param bo 意见箱
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(BusComplaintBoxBo bo) {
+        BusComplaintBox update = MapstructUtils.convert(bo, BusComplaintBox.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(BusComplaintBox entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除意见箱信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * app获取当前用户提出意见列表
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<BusComplaintBoxVo> appQueryPageList(BusComplaintBoxBo bo, PageQuery pageQuery) {
+        Page<BusComplaintBoxVo> result = baseMapper.selectVoPageList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * app获取当前意见详情
+     * @param id
+     * @return
+     */
+    @Override
+    public AppDetailsOfTheOpinionVo appQueryById(Long id) {
+        AppDetailsOfTheOpinionVo vo = new AppDetailsOfTheOpinionVo();
+        BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(id);
+        if(busComplaintBoxVo == null){
+            throw new ServiceException("找不到意见信息！！！");
+        }
+        if (busComplaintBoxVo.getAvatar() != null){
+            SysOssVo ossVo = sysOssService.getById(busComplaintBoxVo.getAvatar());
+            if (ossVo != null){
+                busComplaintBoxVo.setAvatarUrl(ossVo.getUrl());
+            }
+        }
+        if (busComplaintBoxVo.getFileId() != null){
+            String[] split = busComplaintBoxVo.getFileId().split(",");
+            List<Long> fileIds = Arrays.stream(split)
+                .filter(str -> str != null && !str.trim().isEmpty()) // 过滤空值和空白字符串
+                .map(str -> {
+                    try {
+                        return Long.valueOf(str.trim());
+                    } catch (NumberFormatException e) {
+                        // 转换失败时可返回null，后续再过滤
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull) // 过滤转换失败的null值
+                .toList();
+            List<SysOssVo> sysOssVos = sysOssService.listByIds(fileIds);
+            List<String> urls = new ArrayList<>();
+            sysOssVos.forEach(sysOssVo -> {
+                if (sysOssVo != null){
+                    urls.add(sysOssVo.getUrl());
+                }
+            });
+            busComplaintBoxVo.setFileUrls(urls);
+        }
+        vo.setBusComplaintBoxVo(busComplaintBoxVo);
+        List<BusComplaintBoxMessageLoggingVo> messageLoggingVos = messageLoggingMapper.selectVoList(new LambdaQueryWrapper<BusComplaintBoxMessageLogging>().eq(BusComplaintBoxMessageLogging::getComplaintId, id));
+        if(CollectionUtils.isNotEmpty(messageLoggingVos)){
+            messageLoggingVos.forEach(mvo->{
+                if (mvo.getReplyAvatar() != null){
+                    SysOssVo ossVo = sysOssService.getById(mvo.getReplyAvatar());
+                    if (ossVo != null){
+                        mvo.setReplyAvatarUrl(ossVo.getUrl());
+                    }
+                }
+                if (mvo.getRepliedAvatar() != null){
+                    SysOssVo ossVo = sysOssService.getById(mvo.getRepliedAvatar());
+                    if (ossVo != null){
+                        mvo.setRepliedAvatarUrl(ossVo.getUrl());
+                    }
+                }
+            });
+            vo.setMessageLoggingVos(messageLoggingVos);
+        }
+        return vo;
+    }
+
+    @Override
+    public DetailsOfTheOpinionVo getInfo(Long id) {
+        DetailsOfTheOpinionVo vo = new DetailsOfTheOpinionVo();
+        BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(id);
+        if(busComplaintBoxVo == null){
+            throw new ServiceException("找不到意见信息！！！");
+        }
+        vo.setBusComplaintBoxVo(busComplaintBoxVo);
+        List<BusComplaintBoxMessageLoggingVo> messageLoggingVos = messageLoggingMapper.selectVoList(new LambdaQueryWrapper<BusComplaintBoxMessageLogging>().eq(BusComplaintBoxMessageLogging::getComplaintId, id));
+        if(CollectionUtils.isNotEmpty(messageLoggingVos)){
+            messageLoggingVos.forEach(messageLoggingVo->{
+                messageLoggingVo.setType(messageLoggingVo.getReplyUserId().equals(busComplaintBoxVo.getUserId()) ? 0 : 1);
+                if (messageLoggingVo.getReplyAvatar() != null){
+                    SysOssVo ossVo = sysOssService.getById(messageLoggingVo.getReplyAvatar());
+                    if (ossVo != null){
+                        messageLoggingVo.setReplyAvatarUrl(ossVo.getUrl());
+                    }
+                }
+                if (messageLoggingVo.getRepliedAvatar() != null){
+                    SysOssVo ossVo = sysOssService.getById(messageLoggingVo.getRepliedAvatar());
+                    if (ossVo != null){
+                        messageLoggingVo.setRepliedAvatarUrl(ossVo.getUrl());
+                    }
+                }
+            });
+            vo.setMessageLoggingVos(messageLoggingVos);
+        }
+        return vo;
+
+    }
+
+
+
+    /**
+     * app修改沟通记录阅读状态
+     * @param bo
+     * @return
+     */
+    @Override
+    public int editCheckStatus(BusComplaintBoxBo bo) {
+        if (bo.getId() == null || bo.getUserId() == null) {
+            return 1;
+        }
+        Long count = messageLoggingMapper.selectCount(new LambdaQueryWrapper<BusComplaintBoxMessageLogging>()
+            .eq(BusComplaintBoxMessageLogging::getStatus,"0")
+            .eq(BusComplaintBoxMessageLogging::getComplaintId, bo.getId())
+            .eq(BusComplaintBoxMessageLogging::getRepliedUserId, bo.getUserId()));
+        if (count == 0) {
+            return 1;
+        }
+        return messageLoggingMapper.update(new LambdaUpdateWrapper<BusComplaintBoxMessageLogging>()
+            .set(BusComplaintBoxMessageLogging::getStatus,"1")
+            .eq(BusComplaintBoxMessageLogging::getComplaintId,bo.getId())
+            .eq(BusComplaintBoxMessageLogging::getRepliedUserId,bo.getUserId()));
+    }
+
+    @Override
+    public List<ComplaintBoxCountVo> getCount(BusComplaintBoxBo bo) {
+
+        return baseMapper.getCount(bo);
+    }
+
+    @Override
+    public int editStatus(BusComplaintBoxBo bo) {
+        BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(bo.getId());
+        if (busComplaintBoxVo == null){
+            throw new ServiceException("找不到意见！！");
+        }
+        if ("14".equals(busComplaintBoxVo.getStatus())){
+            throw new ServiceException("该意见已经关闭，不允许再修改状态");
+        }
+        return baseMapper.update(new LambdaUpdateWrapper<BusComplaintBox>().set(BusComplaintBox::getStatus,bo.getStatus()).eq(BusComplaintBox::getId, bo.getId()));
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java

@@ -662,6 +662,11 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
             .eq(SubConstructionUser::getId, id)
             .set(SubConstructionUser::getProjectId, req.getProjectId())
             .set(SubConstructionUser::getContractorId, req.getContractorId());
+
+        userProjectRelevancyService.deleteByUserId(constructionUser.getSysUserId());
+
+        roleService.deleteRoleByUserIdAndProjectId(constructionUser.getSysUserId(),req.getProjectId());
+
         return this.update(lambdaUpdate);
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java

@@ -0,0 +1,123 @@
+package org.dromara.device.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.dromara.project.domain.BusProject;
+import org.dromara.project.service.IBusProjectService;
+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.device.domain.vo.DeviceAccessRecordVo;
+import org.dromara.device.domain.bo.DeviceAccessRecordBo;
+import org.dromara.device.service.IDeviceAccessRecordService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备进出场记录
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/device/accessRecord")
+public class DeviceAccessRecordController extends BaseController {
+
+    private final IDeviceAccessRecordService deviceAccessRecordService;
+
+    private final IBusProjectService projectService;
+
+    /**
+     * 查询设备进出场记录列表
+     */
+//    @SaCheckPermission("device:accessRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceAccessRecordVo> list(DeviceAccessRecordBo bo, PageQuery pageQuery) {
+        return deviceAccessRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备进出场记录列表
+     */
+    @SaCheckPermission("device:accessRecord:export")
+    @Log(title = "设备进出场记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceAccessRecordBo bo, HttpServletResponse response) {
+        List<DeviceAccessRecordVo> list = deviceAccessRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备进出场记录", DeviceAccessRecordVo.class, response);
+    }
+
+    /**
+     * 获取设备进出场记录详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("device:accessRecord:query")
+    @GetMapping("/{id}")
+    public R<DeviceAccessRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceAccessRecordService.queryById(id));
+    }
+
+    /**
+     * 子项目列表
+     */
+    @GetMapping("/childProjectList/{projectId}")
+    public R<List<BusProject>> childProjectId(@PathVariable Long projectId) {
+        List<BusProject> list = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getProjectName)
+            .eq(BusProject::getPId, projectId).list();
+        return R.ok(list);
+    }
+
+
+    /**
+     * 新增设备进出场记录
+     */
+    @SaCheckPermission("device:accessRecord:add")
+    @Log(title = "设备进出场记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceAccessRecordBo bo) {
+        return toAjax(deviceAccessRecordService.insertByBo(bo));
+    }
+
+
+
+    /**
+     * 修改设备进出场记录
+     */
+//    @SaCheckPermission("device:accessRecord:edit")
+    @Log(title = "设备进出场记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceAccessRecordBo bo) {
+        return toAjax(deviceAccessRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备进出场记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:accessRecord:remove")
+    @Log(title = "设备进出场记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceAccessRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java

@@ -0,0 +1,140 @@
+package org.dromara.device.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.device.domain.bo.DeviceAccessRecordBo;
+import org.dromara.device.domain.vo.DeviceAccessRecordVo;
+import org.dromara.device.domain.vo.DeviceInfoCountVo;
+import org.dromara.device.service.IDeviceAccessRecordService;
+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.device.domain.vo.DeviceInfoVo;
+import org.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.service.IDeviceInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备信息
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/device/info")
+public class DeviceInfoController extends BaseController {
+
+    private final IDeviceInfoService deviceInfoService;
+
+    private final IDeviceAccessRecordService deviceAccessRecordService;
+
+    /**
+     * 查询设备信息列表
+     */
+    @SaCheckPermission("device:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceInfoVo> list(DeviceInfoBo bo, PageQuery pageQuery) {
+        return deviceInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备信息列表
+     */
+    @SaCheckPermission("device:info:export")
+    @Log(title = "设备信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceInfoBo bo, HttpServletResponse response) {
+        List<DeviceInfoVo> list = deviceInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备信息", DeviceInfoVo.class, response);
+    }
+
+    /**
+     * 获取设备信息详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("device:info:query")
+    @GetMapping("/{id}")
+    public R<DeviceInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceInfoService.queryById(id));
+    }
+
+    /**
+     * 进出场纪录
+     */
+    @GetMapping("/recordList")
+    public R<List<DeviceAccessRecordVo>> recordList(DeviceAccessRecordBo bo) {
+        List<DeviceAccessRecordVo> list = deviceAccessRecordService.queryList(bo);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 设备信息统计
+     */
+    @SaCheckPermission("device:info:list")
+    @GetMapping("/count/{projectId}")
+    public R<Map<String, Integer>> count(@PathVariable Long projectId) {
+        return R.ok(deviceInfoService.count(projectId));
+    }
+
+    /**
+     * 设备类型统计
+     */
+    @SaCheckPermission("device:info:list")
+    @GetMapping("/typeCount/{projectId}")
+    public R<Map<String, Integer>> typeCount(@PathVariable Long projectId) {
+        return R.ok(deviceInfoService.typeCount(projectId));
+    }
+
+    /**
+     * 新增设备信息
+     */
+    @SaCheckPermission("device:info:add")
+    @Log(title = "设备信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceInfoBo bo) {
+        return toAjax(deviceInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备信息
+     */
+    @SaCheckPermission("device:info:edit")
+    @Log(title = "设备信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceInfoBo bo) {
+        return toAjax(deviceInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:info:remove")
+    @Log(title = "设备信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java

@@ -0,0 +1,188 @@
+package org.dromara.device.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+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.device.domain.vo.DeviceTypeVo;
+import org.dromara.device.domain.bo.DeviceTypeBo;
+import org.dromara.device.service.IDeviceTypeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备类型
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/device/type")
+public class DeviceTypeController extends BaseController {
+
+    private final IDeviceTypeService deviceTypeService;
+
+    /**
+     * 查询设备类型列表
+     */
+    @SaCheckPermission("device:type:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceTypeVo> list(DeviceTypeBo bo, PageQuery pageQuery) {
+        return deviceTypeService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 设备树状列表
+     */
+    @SaCheckPermission("device:type:list")
+    @GetMapping("/treeList")
+    public R<List<DeviceTypeVo>> treeList(DeviceTypeBo bo) {
+        List<DeviceTypeVo> list = deviceTypeService.queryList(bo);
+        List<DeviceTypeVo> deviceTypeVos = buildTreeWithAutoRoot(list);
+        return R.ok(deviceTypeVos);
+    }
+
+
+    public static List<DeviceTypeVo> buildTreeWithAutoRoot(List<DeviceTypeVo> list) {
+        // 1. 用 Map 缓存所有节点（key=节点ID，value=节点对象）
+        // 防御性判断：空列表直接返回，避免空指针
+        if (list == null || list.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        // 1. 提取所有有效节点ID（用于判断父ID是否存在）
+        Set<Long> validNodeIds = list.stream()
+            .map(DeviceTypeVo::getId)
+            .collect(Collectors.toSet());
+
+        // 2. 用Map缓存所有节点（key=节点ID，value=节点对象），O(1)查找
+        Map<Long, DeviceTypeVo> nodeMap = list.stream()
+            .collect(Collectors.toMap(DeviceTypeVo::getId, node -> node));
+
+        List<DeviceTypeVo> rootNodes = new ArrayList<>();
+        List<DeviceTypeVo> orphanNodes = new ArrayList<>();
+
+        for (DeviceTypeVo node : list) {
+            Long parentId = node.getParentId();
+            boolean isRoot = false;
+
+            // 判定是否为顶级节点（满足以下任一条件）
+            if (parentId == null || parentId == 0) {
+                // 条件1：parentId为0或NULL（设计约定的顶级节点）
+                isRoot = true;
+            } else if (!validNodeIds.contains(parentId)) {
+                // 条件2：parentId不在有效节点ID中（孤儿节点，视为顶级）
+                isRoot = true;
+                orphanNodes.add(node);
+            }
+
+            if (isRoot) {
+                // 顶级节点直接加入根列表，无需挂载
+                rootNodes.add(node);
+            } else {
+                // 非顶级节点：挂载到父节点的children中
+                DeviceTypeVo parentNode = nodeMap.get(parentId);
+                if (parentNode != null) {
+                    if (parentNode.getChildren() == null) {
+                        parentNode.setChildren(new ArrayList<>());
+                    }
+                    // 关键：避免重复挂载（判断子节点中是否已存在当前节点）
+                    boolean isAlreadyMounted = parentNode.getChildren().stream()
+                        .anyMatch(child -> child.getId().equals(node.getId()));
+                    if (!isAlreadyMounted) {
+                        parentNode.getChildren().add(node);
+                    }
+                }
+            }
+        }
+
+        // 打印孤儿节点日志（便于排查数据问题）
+        if (!orphanNodes.isEmpty()) {
+            String orphanIds = orphanNodes.stream()
+                .map(DeviceTypeVo::getId)
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+            System.out.println("警告：存在孤儿节点（父节点不存在），节点ID：" + orphanIds);
+        }
+
+        return rootNodes;
+    }
+
+
+    /**
+     * 导出设备类型列表
+     */
+    @SaCheckPermission("device:type:export")
+    @Log(title = "设备类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceTypeBo bo, HttpServletResponse response) {
+        List<DeviceTypeVo> list = deviceTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备类型", DeviceTypeVo.class, response);
+    }
+
+    /**
+     * 获取设备类型详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("device:type:query")
+    @GetMapping("/{id}")
+    public R<DeviceTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceTypeService.queryById(id));
+    }
+
+    /**
+     * 新增设备类型
+     */
+    @SaCheckPermission("device:type:add")
+    @Log(title = "设备类型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceTypeBo bo) {
+        return toAjax(deviceTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备类型
+     */
+    @SaCheckPermission("device:type:edit")
+    @Log(title = "设备类型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceTypeBo bo) {
+        return toAjax(deviceTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备类型
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:type:remove")
+    @Log(title = "设备类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceAccessRecord.java

@@ -0,0 +1,85 @@
+package org.dromara.device.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 设备进出场记录对象 device_access_record
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_access_record")
+public class DeviceAccessRecord extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 记录编号（唯一标识，如：RC-2024-0012）
+     */
+    private String recordNo;
+
+    /**
+     * 设备ID（关联设备表device的id）
+     */
+    private Long deviceId;
+
+    /**
+     * 设备名
+     */
+    private String deviceName;
+
+    /**
+     * 状态（1-进场，2-出场，可扩展其他状态）
+     */
+    private String status;
+
+    /**
+     * 操作时间（记录发生的时间，如：2024-03-15 09:30:25）
+     */
+    private LocalDateTime operateTime;
+
+    /**
+     * 子项目名字
+     */
+    private String location;
+
+    /**
+     * 操作人ID（关联用户表user的id）
+     */
+    private Long operatorId;
+
+    /**
+     * 操作人姓名（冗余存储，如：张三）
+     */
+    private String operatorName;
+
+    /**
+     * 原因（如：安装使用、设备调拨、入库存储）
+     */
+    private String reason;
+
+    /**
+     * 详细说明（查看详情时展示的补充信息，可选）
+     */
+    private String details;
+
+    /**
+     * 子项目ID
+     */
+    private Long childProjectId;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceInfo.java

@@ -0,0 +1,104 @@
+package org.dromara.device.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+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;
+import java.time.LocalDate;
+
+/**
+ * 设备信息对象 device_info
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_info")
+public class DeviceInfo extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 项目Id
+     */
+    private Long projectId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 型号规格
+     */
+    private String modelSpec;
+
+    /**
+     * 设备类型ID（关联设备类型表device_type的id）
+     */
+    private Long typeId;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 出厂日期（yyyy-mm-dd）
+     */
+    private LocalDate productionDate;
+
+    /**
+     * 保修日期（yyyy-mm-dd）
+     */
+    private LocalDate warrantyDate;
+
+    /**
+     * 设备状态（0-闲置，1-使用中，2-维修中，3-报废）
+     */
+    private String status;
+
+    /**
+     * 负责人姓名
+     */
+    private String responsiblePerson;
+
+    /**
+     * 联系电话（支持固定电话和手机号）
+     */
+    private String contactPhone;
+
+    /**
+     * 设备描述（详细说明）
+     */
+    private String description;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 附件
+     */
+    private String file;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceType.java

@@ -0,0 +1,61 @@
+package org.dromara.device.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 设备类型对象 device_type
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_type")
+public class DeviceType extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 设备类型名称
+     */
+    private String typeName;
+
+    /**
+     * 父类型ID
+     */
+    private Long parentId;
+
+    /**
+     * 层级（1=顶级，2=二级，3=三级...，最大支持255级）
+     */
+    private Integer level;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 设备类型描述
+     */
+    private String description;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java

@@ -0,0 +1,86 @@
+package org.dromara.device.domain.bo;
+
+import org.dromara.device.domain.DeviceAccessRecord;
+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 java.time.LocalDateTime;
+
+/**
+ * 设备进出场记录业务对象 device_access_record
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceAccessRecord.class, reverseConvertGenerate = false)
+public class DeviceAccessRecordBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 记录编号（唯一标识，如：RC-2024-0012）
+     */
+    private String recordNo;
+
+    /**
+     * 设备ID（关联设备表device的id）
+     */
+    private Long deviceId;
+
+    /**
+     * 设备名
+     */
+    private String deviceName;
+
+    /**
+     * 状态（1-进场，2-出场，可扩展其他状态）
+     */
+    private String status;
+
+    /**
+     * 操作时间（记录发生的时间，如：2024-03-15 09:30:25）
+     */
+    private LocalDateTime operateTime;
+
+    /**
+     * 位置/目的地（如：A区-1号电站、B区仓库→A区电站）
+     */
+    private String location;
+
+    /**
+     * 操作人ID（关联用户表user的id）
+     */
+    private Long operatorId;
+
+    /**
+     * 操作人姓名（冗余存储，如：张三）
+     */
+    private String operatorName;
+
+    /**
+     * 原因（如：安装使用、设备调拨、入库存储）
+     */
+    private String reason;
+
+    /**
+     * 详细说明（查看详情时展示的补充信息，可选）
+     */
+    private String details;
+
+    /**
+     * 子项目ID
+     */
+    private Long childProjectId;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceInfoBo.java

@@ -0,0 +1,104 @@
+package org.dromara.device.domain.bo;
+
+import org.dromara.device.domain.DeviceInfo;
+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;
+
+import java.time.LocalDate;
+
+/**
+ * 设备信息业务对象 device_info
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceInfo.class, reverseConvertGenerate = false)
+public class DeviceInfoBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 项目Id
+     */
+    private Long projectId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 型号规格
+     */
+    private String modelSpec;
+
+    /**
+     * 设备类型ID（关联设备类型表device_type的id）
+     */
+    private Long typeId;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 出厂日期（yyyy-mm-dd）
+     */
+    private LocalDate productionDate;
+
+    /**
+     * 保修日期（yyyy-mm-dd）
+     */
+    private LocalDate warrantyDate;
+
+    /**
+     * 设备状态（0-闲置，1-使用中，2-维修中，3-报废）
+     */
+    private String status;
+
+    /**
+     * 负责人姓名
+     */
+    private String responsiblePerson;
+
+    /**
+     * 联系电话（支持固定电话和手机号）
+     */
+    private String contactPhone;
+
+    /**
+     * 设备描述（详细说明）
+     */
+    private String description;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 附件
+     */
+    private String file;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceTypeBo.java

@@ -0,0 +1,53 @@
+package org.dromara.device.domain.bo;
+
+import org.dromara.device.domain.DeviceType;
+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.*;
+
+/**
+ * 设备类型业务对象 device_type
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceType.class, reverseConvertGenerate = false)
+public class DeviceTypeBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    private String typeCode;
+
+    /**
+     * 设备类型名称
+     */
+    @NotBlank(message = "设备类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeName;
+
+    /**
+     * 父类型ID
+     */
+    private Long parentId;
+
+    /**
+     * 层级（1=顶级，2=二级，3=三级...，最大支持255级）
+     */
+    private Integer level;
+
+    /**
+     * 设备类型描述
+     */
+    private String description;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceAccessRecordVo.java

@@ -0,0 +1,99 @@
+package org.dromara.device.domain.vo;
+
+import org.dromara.device.domain.DeviceAccessRecord;
+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.time.LocalDateTime;
+import java.util.Date;
+
+
+
+/**
+ * 设备进出场记录视图对象 device_access_record
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceAccessRecord.class)
+public class DeviceAccessRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 记录编号（唯一标识，如：RC-2024-0012）
+     */
+    @ExcelProperty(value = "记录编号", converter = ExcelDictConvert.class)
+    private String recordNo;
+
+    /**
+     * 设备ID（关联设备表device的id）
+     */
+    @ExcelProperty(value = "设备ID", converter = ExcelDictConvert.class)
+    private Long deviceId;
+
+    /**
+     * 设备名
+     */
+    @ExcelProperty(value = "设备名")
+    private String deviceName;
+
+    /**
+     * 状态（1-进场，2-出场，可扩展其他状态）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    private String status;
+
+    /**
+     * 操作时间（记录发生的时间，如：2024-03-15 09:30:25）
+     */
+    @ExcelProperty(value = "操作时间", converter = ExcelDictConvert.class)
+    private LocalDateTime operateTime;
+
+    /**
+     * 位置/目的地（如：A区-1号电站、B区仓库→A区电站）
+     */
+    @ExcelProperty(value = "位置/目的地", converter = ExcelDictConvert.class)
+    private String location;
+
+    /**
+     * 操作人ID（关联用户表user的id）
+     */
+    @ExcelProperty(value = "操作人ID", converter = ExcelDictConvert.class)
+    private Long operatorId;
+
+    /**
+     * 操作人姓名（冗余存储，如：张三）
+     */
+    @ExcelProperty(value = "操作人姓名", converter = ExcelDictConvert.class)
+    private String operatorName;
+
+    /**
+     * 原因（如：安装使用、设备调拨、入库存储）
+     */
+    @ExcelProperty(value = "原因", converter = ExcelDictConvert.class)
+    private String reason;
+
+    /**
+     * 详细说明（查看详情时展示的补充信息，可选）
+     */
+    @ExcelProperty(value = "详细说明", converter = ExcelDictConvert.class)
+    private String details;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java

@@ -0,0 +1,27 @@
+package org.dromara.device.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class DeviceInfoCountVo {
+    /**
+     * 总数
+     */
+    private Integer total;
+    /**
+     * 使用
+     */
+    private Integer use;
+    /**
+     * 维护
+     */
+    private Integer maintain;
+    /**
+     * 闲置
+     */
+    private Integer idle;
+    /**
+     * 报废
+     */
+    private Integer broken;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java

@@ -0,0 +1,137 @@
+package org.dromara.device.domain.vo;
+
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.device.domain.DeviceInfo;
+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.time.LocalDate;
+import java.util.Date;
+
+
+
+/**
+ * 设备信息视图对象 device_info
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceInfo.class)
+public class DeviceInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 项目Id
+     */
+    @ExcelProperty(value = "项目Id")
+    private Long projectId;
+
+    /**
+     * 设备编号
+     */
+    @ExcelProperty(value = "设备编号")
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 型号规格
+     */
+    @ExcelProperty(value = "型号规格")
+    private String modelSpec;
+
+    /**
+     * 设备类型ID（关联设备类型表device_type的id）
+     */
+    @ExcelProperty(value = "设备类型ID", converter = ExcelDictConvert.class)
+    private Long typeId;
+
+    private String typeName;
+
+    /**
+     * 生产厂家
+     */
+    @ExcelProperty(value = "生产厂家")
+    private String manufacturer;
+
+    /**
+     * 出厂日期（yyyy-mm-dd）
+     */
+    @ExcelProperty(value = "出厂日期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "y=yyy-mm-dd")
+    private LocalDate productionDate;
+
+    /**
+     * 保修日期（yyyy-mm-dd）
+     */
+    @ExcelProperty(value = "保修日期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "y=yyy-mm-dd")
+    private LocalDate warrantyDate;
+
+    /**
+     * 设备状态（0-闲置，1-使用中，2-维修中，3-报废）
+     */
+    @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=-闲置，1-使用中，2-维修中，3-报废")
+    private String status;
+
+    /**
+     * 负责人姓名
+     */
+    @ExcelProperty(value = "负责人姓名")
+    private String responsiblePerson;
+
+    /**
+     * 联系电话（支持固定电话和手机号）
+     */
+    @ExcelProperty(value = "联系电话", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "支=持固定电话和手机号")
+    private String contactPhone;
+
+    /**
+     * 设备描述（详细说明）
+     */
+    @ExcelProperty(value = "设备描述", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "详=细说明")
+    private String description;
+
+    /**
+     * 图片
+     */
+    @ExcelProperty(value = "图片")
+    private String image;
+
+    /**
+     * 图片Url
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "image")
+    private String imageUrl;
+    /**
+     * 附件
+     */
+    @ExcelProperty(value = "附件")
+    private String file;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceTypeVo.java

@@ -0,0 +1,78 @@
+package org.dromara.device.domain.vo;
+
+import org.dromara.device.domain.DeviceType;
+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;
+import java.util.List;
+
+
+/**
+ * 设备类型视图对象 device_type
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceType.class)
+public class DeviceTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 设备类型编码
+     */
+    @ExcelProperty(value = "设备类型编码")
+    private String typeCode;
+
+    /**
+     * 设备类型名称
+     */
+    @ExcelProperty(value = "设备类型名称")
+    private String typeName;
+
+    /**
+     * 父类型ID
+     */
+    @ExcelProperty(value = "父类型ID")
+    private Long parentId;
+
+    /**
+     * 层级（1=顶级，2=二级，3=三级...，最大支持255级）
+     */
+    @ExcelProperty(value = "层级", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1==顶级，2=二级，3=三级...，最大支持255级")
+    private Integer level;
+
+    /**
+     * 祖级列表
+     */
+    @ExcelProperty(value = "祖级列表")
+    private String ancestors;
+
+    /**
+     * 设备类型描述
+     */
+    @ExcelProperty(value = "设备类型描述")
+    private String description;
+
+
+    private List<DeviceTypeVo> children;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceAccessRecordMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.device.mapper;
+
+import org.dromara.device.domain.DeviceAccessRecord;
+import org.dromara.device.domain.vo.DeviceAccessRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备进出场记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface DeviceAccessRecordMapper extends BaseMapperPlus<DeviceAccessRecord, DeviceAccessRecordVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.device.mapper;
+
+import org.dromara.device.domain.DeviceInfo;
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface DeviceInfoMapper extends BaseMapperPlus<DeviceInfo, DeviceInfoVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceTypeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.device.mapper;
+
+import org.dromara.device.domain.DeviceType;
+import org.dromara.device.domain.vo.DeviceTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备类型Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface DeviceTypeMapper extends BaseMapperPlus<DeviceType, DeviceTypeVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceAccessRecordService.java

@@ -0,0 +1,70 @@
+package org.dromara.device.service;
+
+import org.dromara.device.domain.vo.DeviceAccessRecordVo;
+import org.dromara.device.domain.bo.DeviceAccessRecordBo;
+import org.dromara.device.domain.DeviceAccessRecord;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备进出场记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IDeviceAccessRecordService extends IService<DeviceAccessRecord>{
+
+    /**
+     * 查询设备进出场记录
+     *
+     * @param id 主键
+     * @return 设备进出场记录
+     */
+    DeviceAccessRecordVo queryById(Long id);
+
+    /**
+     * 分页查询设备进出场记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备进出场记录分页列表
+     */
+    TableDataInfo<DeviceAccessRecordVo> queryPageList(DeviceAccessRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备进出场记录列表
+     *
+     * @param bo 查询条件
+     * @return 设备进出场记录列表
+     */
+    List<DeviceAccessRecordVo> queryList(DeviceAccessRecordBo bo);
+
+    /**
+     * 新增设备进出场记录
+     *
+     * @param bo 设备进出场记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceAccessRecordBo bo);
+
+    /**
+     * 修改设备进出场记录
+     *
+     * @param bo 设备进出场记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceAccessRecordBo bo);
+
+    /**
+     * 校验并批量删除设备进出场记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java

@@ -0,0 +1,83 @@
+package org.dromara.device.service;
+
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.domain.DeviceInfo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IDeviceInfoService extends IService<DeviceInfo>{
+
+    /**
+     * 查询设备信息
+     *
+     * @param id 主键
+     * @return 设备信息
+     */
+    DeviceInfoVo queryById(Long id);
+
+    /**
+     * 分页查询设备信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备信息分页列表
+     */
+    TableDataInfo<DeviceInfoVo> queryPageList(DeviceInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备信息列表
+     *
+     * @param bo 查询条件
+     * @return 设备信息列表
+     */
+    List<DeviceInfoVo> queryList(DeviceInfoBo bo);
+
+    /**
+     * 新增设备信息
+     *
+     * @param bo 设备信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceInfoBo bo);
+
+    /**
+     * 修改设备信息
+     *
+     * @param bo 设备信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceInfoBo bo);
+
+    /**
+     * 校验并批量删除设备信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 设备数量统计
+     */
+    Map<String, Integer> count(Long projectId);
+
+    /**
+     * 设备类型统计
+     */
+    Map<String, Integer> typeCount(Long projectId);
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceTypeService.java

@@ -0,0 +1,70 @@
+package org.dromara.device.service;
+
+import org.dromara.device.domain.vo.DeviceTypeVo;
+import org.dromara.device.domain.bo.DeviceTypeBo;
+import org.dromara.device.domain.DeviceType;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备类型Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IDeviceTypeService extends IService<DeviceType>{
+
+    /**
+     * 查询设备类型
+     *
+     * @param id 主键
+     * @return 设备类型
+     */
+    DeviceTypeVo queryById(Long id);
+
+    /**
+     * 分页查询设备类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备类型分页列表
+     */
+    TableDataInfo<DeviceTypeVo> queryPageList(DeviceTypeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备类型列表
+     *
+     * @param bo 查询条件
+     * @return 设备类型列表
+     */
+    List<DeviceTypeVo> queryList(DeviceTypeBo bo);
+
+    /**
+     * 新增设备类型
+     *
+     * @param bo 设备类型
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceTypeBo bo);
+
+    /**
+     * 修改设备类型
+     *
+     * @param bo 设备类型
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceTypeBo bo);
+
+    /**
+     * 校验并批量删除设备类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceAccessRecordServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.device.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.device.domain.bo.DeviceAccessRecordBo;
+import org.dromara.device.domain.vo.DeviceAccessRecordVo;
+import org.dromara.device.domain.DeviceAccessRecord;
+import org.dromara.device.mapper.DeviceAccessRecordMapper;
+import org.dromara.device.service.IDeviceAccessRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备进出场记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class DeviceAccessRecordServiceImpl extends ServiceImpl<DeviceAccessRecordMapper, DeviceAccessRecord> implements IDeviceAccessRecordService {
+
+    private final DeviceAccessRecordMapper baseMapper;
+
+    /**
+     * 查询设备进出场记录
+     *
+     * @param id 主键
+     * @return 设备进出场记录
+     */
+    @Override
+    public DeviceAccessRecordVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备进出场记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备进出场记录分页列表
+     */
+    @Override
+    public TableDataInfo<DeviceAccessRecordVo> queryPageList(DeviceAccessRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DeviceAccessRecord> lqw = buildQueryWrapper(bo);
+        Page<DeviceAccessRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备进出场记录列表
+     *
+     * @param bo 查询条件
+     * @return 设备进出场记录列表
+     */
+    @Override
+    public List<DeviceAccessRecordVo> queryList(DeviceAccessRecordBo bo) {
+        LambdaQueryWrapper<DeviceAccessRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DeviceAccessRecord> buildQueryWrapper(DeviceAccessRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DeviceAccessRecord> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(DeviceAccessRecord::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getRecordNo()), DeviceAccessRecord::getRecordNo, bo.getRecordNo());
+        lqw.eq(bo.getDeviceId() != null, DeviceAccessRecord::getDeviceId, bo.getDeviceId());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceAccessRecord::getDeviceName, bo.getDeviceName());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceAccessRecord::getStatus, bo.getStatus());
+        lqw.eq(bo.getOperateTime() != null, DeviceAccessRecord::getOperateTime, bo.getOperateTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), DeviceAccessRecord::getLocation, bo.getLocation());
+        lqw.eq(bo.getOperatorId() != null, DeviceAccessRecord::getOperatorId, bo.getOperatorId());
+        lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), DeviceAccessRecord::getOperatorName, bo.getOperatorName());
+        lqw.eq(StringUtils.isNotBlank(bo.getReason()), DeviceAccessRecord::getReason, bo.getReason());
+        lqw.eq(StringUtils.isNotBlank(bo.getDetails()), DeviceAccessRecord::getDetails, bo.getDetails());
+        return lqw;
+    }
+
+    /**
+     * 新增设备进出场记录
+     *
+     * @param bo 设备进出场记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DeviceAccessRecordBo bo) {
+        DeviceAccessRecord add = MapstructUtils.convert(bo, DeviceAccessRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备进出场记录
+     *
+     * @param bo 设备进出场记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DeviceAccessRecordBo bo) {
+        DeviceAccessRecord update = MapstructUtils.convert(bo, DeviceAccessRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DeviceAccessRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备进出场记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java

@@ -0,0 +1,216 @@
+package org.dromara.device.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
+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.dromara.device.domain.DeviceAccessRecord;
+import org.dromara.device.domain.DeviceType;
+import org.dromara.device.domain.vo.DeviceInfoCountVo;
+import org.dromara.device.service.IDeviceAccessRecordService;
+import org.dromara.device.service.IDeviceTypeService;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.service.ISysDictDataService;
+import org.dromara.system.service.ISysDictTypeService;
+import org.springframework.stereotype.Service;
+import org.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.device.domain.DeviceInfo;
+import org.dromara.device.mapper.DeviceInfoMapper;
+import org.dromara.device.service.IDeviceInfoService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 设备信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceInfo> implements IDeviceInfoService {
+
+    private final DeviceInfoMapper baseMapper;
+
+    private final IDeviceTypeService deviceTypeService;
+
+    private final IDeviceAccessRecordService deviceAccessRecordService;
+
+    private final ISysDictTypeService dictTypeService;
+
+    /**
+     * 查询设备信息
+     *
+     * @param id 主键
+     * @return 设备信息
+     */
+    @Override
+    public DeviceInfoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备信息分页列表
+     */
+    @Override
+    public TableDataInfo<DeviceInfoVo> queryPageList(DeviceInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DeviceInfo> lqw = buildQueryWrapper(bo);
+        Page<DeviceInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<DeviceInfoVo> records = result.getRecords();
+        Set<Long> collect = records.stream().map(DeviceInfoVo::getTypeId).collect(Collectors.toSet());
+        if(CollectionUtil.isEmpty(collect)){
+            return TableDataInfo.build(result);
+        }
+        List<DeviceType> deviceTypes = deviceTypeService.listByIds(collect);
+        Map<Long, String> deviceTypeMap = deviceTypes.stream().collect(Collectors.toMap(DeviceType::getId, DeviceType::getTypeName));
+        result.getRecords().forEach(deviceInfoVo -> {
+            deviceInfoVo.setTypeName(deviceTypeMap.get(deviceInfoVo.getTypeId()));
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备信息列表
+     *
+     * @param bo 查询条件
+     * @return 设备信息列表
+     */
+    @Override
+    public List<DeviceInfoVo> queryList(DeviceInfoBo bo) {
+        LambdaQueryWrapper<DeviceInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DeviceInfo> buildQueryWrapper(DeviceInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DeviceInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(DeviceInfo::getId);
+        lqw.eq(bo.getProjectId() != null, DeviceInfo::getProjectId, bo.getProjectId());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceCode()), DeviceInfo::getDeviceCode, bo.getDeviceCode());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceInfo::getDeviceName, bo.getDeviceName());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelSpec()), DeviceInfo::getModelSpec, bo.getModelSpec());
+        lqw.eq(bo.getTypeId() != null, DeviceInfo::getTypeId, bo.getTypeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), DeviceInfo::getManufacturer, bo.getManufacturer());
+        lqw.eq(bo.getProductionDate() != null, DeviceInfo::getProductionDate, bo.getProductionDate());
+        lqw.eq(bo.getWarrantyDate() != null, DeviceInfo::getWarrantyDate, bo.getWarrantyDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceInfo::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getResponsiblePerson()), DeviceInfo::getResponsiblePerson, bo.getResponsiblePerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), DeviceInfo::getContactPhone, bo.getContactPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getDescription()), DeviceInfo::getDescription, bo.getDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getImage()), DeviceInfo::getImage, bo.getImage());
+        lqw.eq(StringUtils.isNotBlank(bo.getFile()), DeviceInfo::getFile, bo.getFile());
+        return lqw;
+    }
+
+    /**
+     * 新增设备信息
+     *
+     * @param bo 设备信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DeviceInfoBo bo) {
+        DeviceInfo add = MapstructUtils.convert(bo, DeviceInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备信息
+     *
+     * @param bo 设备信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DeviceInfoBo bo) {
+        DeviceInfo update = MapstructUtils.convert(bo, DeviceInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DeviceInfo entity){
+        boolean exists = this.lambdaQuery().eq(DeviceInfo::getDeviceCode, entity.getDeviceCode())
+            .ne(entity.getId() != null, DeviceInfo::getId, entity.getId()).exists();
+        if (exists) {
+            throw new ServiceException("设备编码已存在");
+        }
+    }
+
+    /**
+     * 校验并批量删除设备信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            List<DeviceAccessRecord> list = deviceAccessRecordService.lambdaQuery().in(DeviceAccessRecord::getDeviceId, ids).list();
+            if(CollectionUtil.isNotEmpty(list)){
+                throw new ServiceException("设备存在进出场记录，不能删除");
+            }
+        }
+
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+
+    @Override
+    public Map<String, Integer> count(Long projectId) {
+
+        Map<String, Integer> map = new LinkedHashMap<>();
+        List<SysDictDataVo> deviceStatus = dictTypeService.selectDictDataByType("device_status");
+
+        List<DeviceInfo> list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list();
+        for (SysDictDataVo status : deviceStatus) {
+            map.put(status.getDictLabel(), (int)list.stream().filter(deviceInfo -> status.getDictValue().equals(deviceInfo.getStatus())).count());
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Integer> typeCount(Long projectId) {
+        Map<String, Integer> map = new LinkedHashMap<>();
+
+        List<DeviceInfo> list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list();
+        Set<Long> collect = list.stream().map(DeviceInfo::getTypeId).collect(Collectors.toSet());
+        List<DeviceType> deviceTypes;
+        if(CollectionUtil.isEmpty(collect)){
+            deviceTypes = new ArrayList<>();
+        }else{
+            deviceTypes = deviceTypeService.listByIds(collect);
+        }
+        List<DeviceType> list1 = deviceTypeService.lambdaQuery().eq(DeviceType::getParentId, 0L).list();
+        for (DeviceType deviceType : list1) {
+            Long id = deviceType.getId();
+            long count = deviceTypes.stream()
+                .filter(vo -> vo.getAncestors().contains(StringUtils.SEPARATOR + id) ||vo.getId().equals(id))
+                .count();
+            map.put(deviceType.getTypeName(), (int)count);
+        }
+
+        return map;
+    }
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java

@@ -0,0 +1,175 @@
+package org.dromara.device.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import org.dromara.common.core.exception.ServiceException;
+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.dromara.device.domain.DeviceInfo;
+import org.dromara.device.service.IDeviceInfoService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.dromara.device.domain.bo.DeviceTypeBo;
+import org.dromara.device.domain.vo.DeviceTypeVo;
+import org.dromara.device.domain.DeviceType;
+import org.dromara.device.mapper.DeviceTypeMapper;
+import org.dromara.device.service.IDeviceTypeService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备类型Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
+
+    private final DeviceTypeMapper baseMapper;
+
+    @Resource
+    @Lazy
+    private IDeviceInfoService deviceInfoService;
+
+    /**
+     * 查询设备类型
+     *
+     * @param id 主键
+     * @return 设备类型
+     */
+    @Override
+    public DeviceTypeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备类型分页列表
+     */
+    @Override
+    public TableDataInfo<DeviceTypeVo> queryPageList(DeviceTypeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DeviceType> lqw = buildQueryWrapper(bo);
+        Page<DeviceTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备类型列表
+     *
+     * @param bo 查询条件
+     * @return 设备类型列表
+     */
+    @Override
+    public List<DeviceTypeVo> queryList(DeviceTypeBo bo) {
+        LambdaQueryWrapper<DeviceType> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DeviceType> buildQueryWrapper(DeviceTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DeviceType> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(DeviceType::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getTypeCode()), DeviceType::getTypeCode, bo.getTypeCode());
+        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), DeviceType::getTypeName, bo.getTypeName());
+        lqw.eq(bo.getParentId() != null, DeviceType::getParentId, bo.getParentId());
+        lqw.eq(bo.getLevel() != null, DeviceType::getLevel, bo.getLevel());
+        lqw.eq(StringUtils.isNotBlank(bo.getDescription()), DeviceType::getDescription, bo.getDescription());
+        return lqw;
+    }
+
+    /**
+     * 新增设备类型
+     *
+     * @param bo 设备类型
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DeviceTypeBo bo) {
+        DeviceType add = MapstructUtils.convert(bo, DeviceType.class);
+        validEntityBeforeSave(add);
+        handleLevelAndAncestors(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备类型
+     *
+     * @param bo 设备类型
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DeviceTypeBo bo) {
+        DeviceType update = MapstructUtils.convert(bo, DeviceType.class);
+        validEntityBeforeSave(update);
+        handleLevelAndAncestors(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    private void handleLevelAndAncestors(DeviceType deviceType) {
+        if(deviceType.getParentId() == 0L){
+            deviceType.setAncestors("0");
+            deviceType.setLevel(1);
+        }else {
+            DeviceType parent = baseMapper.selectById(deviceType.getParentId());
+            deviceType.setAncestors(parent.getAncestors() + StringUtils.SEPARATOR + parent.getId());
+            deviceType.setLevel(parent.getLevel() + 1);
+        }
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DeviceType entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        List<Long> checkIds = new ArrayList<>();
+        if(isValid){
+            for (Long id : ids) {
+                DeviceType deviceType = baseMapper.selectById(id);
+                if(deviceType == null){
+                    continue;
+                }
+                String prefix = deviceType.getAncestors() + "," + deviceType.getId();
+                LambdaQueryWrapper<DeviceType> queryWrapper = new LambdaQueryWrapper<DeviceType>()
+                    .like(DeviceType::getAncestors, prefix)
+                    .orderByAsc(DeviceType::getLevel, DeviceType::getId);
+                List<DeviceType> list = baseMapper.selectList(queryWrapper);
+                checkIds.addAll(list.stream().map(DeviceType::getId).toList());
+            }
+            List<DeviceInfo> list = deviceInfoService.lambdaQuery().in(DeviceInfo::getTypeId, checkIds).list();
+            if(CollectionUtil.isNotEmpty(list)){
+                throw new ServiceException("当前类型或子级类型存在设备");
+            }
+        }
+        return baseMapper.deleteByIds(checkIds) > 0;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java

@@ -1,5 +1,6 @@
 package org.dromara.gps.controller;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -247,4 +248,12 @@ public class GpsEquipmentController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(gpsEquipmentService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 查询GPS人员或设备定位日期信息列表
+     */
+    @GetMapping("/getDateList")
+    public R<List<LocalDate>> getRlList(GpsEquipmentSonBo bo) {
+        return R.ok(gpsEquipmentService.getRlList(bo));
+    }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java

@@ -19,13 +19,18 @@ public interface GpsEquipmentMapper extends BaseMapperPlus<GpsEquipment, GpsEqui
 
     @Select("SELECT\n" +
         "  gm.user_id AS userId,\n" +
-        "  su.nick_name AS userName, \n" +
+        "  CASE\n" + // 根据gm.type动态选择userName的取值来源
+        "    WHEN gm.trip_id IS NULL THEN su.nick_name\n" + // type=1时取用户昵称（sys_user）
+        "    WHEN gm.trip_id IS NOT NULL THEN vvi.plate_number\n" + // type=2时取车辆名称（veh_vehicle_info）
+        "    ELSE ''\n" + // 其他type默认空值（或自定义默认内容）
+        "  END AS userName,\n" +
         "  gm.project_id AS projectId,\n" +
         "  bp.project_name AS projectName \n" +
         "FROM\n" +
         "  gps_equipment_son gm\n" +
-        "  LEFT JOIN sys_user su ON gm.user_id = su.user_id \n" +
         "LEFT JOIN bus_project bp ON gm.project_id = bp.id  \n" +
+        "  LEFT JOIN sys_user su ON gm.user_id = su.user_id and gm.trip_id IS NULL\n" +
+        "  LEFT JOIN veh_vehicle_info vvi ON gm.user_id = vvi.id and gm.trip_id IS NOT NULL\n" +
         "WHERE\n" +
         "  gm.client_id =  #{clientId}" +
         " GROUP BY gm.user_id,gm.project_id")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java

@@ -8,6 +8,7 @@ import org.dromara.gps.domain.vo.GpsEquipmentSonVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.gps.domain.vo.GpsStatusVo;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -112,6 +113,28 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
         "    rn = 1;")
     List<GpsEquipmentSonVo> getUeClientList(@Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now);
 
+    @Select("<script>" +
+        "SELECT\n" +
+        "  DATE(create_time)\n" +
+        "FROM\n" +
+        "  gps_equipment_son\n" +
+        "WHERE \n" + // 避免条件拼接时的AND开头问题
+        "     project_id = #{bo.projectId}\n" +
+        "  <choose>\n" + // 互斥选择：userId和clientId二选一
+        "    <when test='bo.clientId != null and bo.clientId != \"\"'>\n" + // 其次clientId
+        "      AND client_id = #{bo.clientId}\n" +
+        "      <if test='bo.userId != null and bo.userId != \"\"'>\n" + // 嵌套if：userId存在则追加
+        "        AND user_id = #{bo.userId}\n" +
+        "      </if>\n" +
+        "    </when>\n" +
+        "    <when test='bo.userId != null and bo.userId != \"\"'>\n" + // 优先userId（可调整顺序）
+        "      AND user_id = #{bo.userId} AND client_id IS NULL\n" +
+        "    </when>\n" +
+        "  </choose>\n" +
+        "    AND create_time BETWEEN #{bo.startTime} AND #{bo.endTime}\n" +
+        "GROUP BY DATE(create_time)\n" +
+        "</script>")
+    List<LocalDate> getUserOrClientDate(@Param("bo") GpsEquipmentSonBo bo);
     @Select("WITH RankedData AS (\n" +
         "    SELECT\n" +
         "        *,\n" +

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java

@@ -1,5 +1,6 @@
 package org.dromara.gps.service;
 
+import org.dromara.gps.domain.bo.GpsEquipmentSonBo;
 import org.dromara.gps.domain.vo.GpsEquipmentSonVo;
 import org.dromara.gps.domain.vo.GpsEquipmentVo;
 import org.dromara.gps.domain.bo.GpsEquipmentBo;
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.gps.domain.vo.GpsProjectVo;
 import org.dromara.gps.domain.vo.GpsUserVo;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
@@ -108,4 +110,11 @@ public interface IGpsEquipmentService extends IService<GpsEquipment>{
     List<GpsEquipmentSonVo> getUeUserListByProjectId(LocalDateTime startOfDay, LocalDateTime now);
 
     List<GpsEquipmentVo> getListToVehicle(GpsEquipmentBo bo);
+
+    /**
+     * 查询GPS人员或设备定位日期信息列表
+     * @param bo
+     * @return
+     */
+    List<LocalDate> getRlList(GpsEquipmentSonBo bo);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java

@@ -9,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.gps.domain.vo.GpsStatusVo;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
@@ -88,4 +89,11 @@ public interface IGpsEquipmentSonService extends IService<GpsEquipmentSon>{
 
     List<GpsEquipmentSonVo> getVehicleList(GpsEquipmentSonBo bo);
     List<GpsEquipmentSonVo> getNewVehicleList(GpsEquipmentSonBo bo);
+
+    /**
+     * 查询GPS人员或设备定位日期信息列表
+     * @param bo
+     * @return
+     */
+    List<LocalDate> getUserOrClientDate(GpsEquipmentSonBo bo);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java

@@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -118,7 +119,13 @@ public class GpsEquipmentServiceImpl extends ServiceImpl<GpsEquipmentMapper, Gps
                 } else {
                     item.setType(2);
                 }
-                if (item.getClientType() != null) {
+                if (item.getGpsType() == 1){
+                    SysUserVo sysUserVo = userService.queryById(item.getUserId());
+                    if (sysUserVo != null) {
+                        item.setUserName(sysUserVo.getNickName());
+                    }
+                }
+                if (item.getGpsType() == 0 && item.getClientType() != null) {
                     if (item.getClientType() == 0) {
                         SysUserVo sysUserVo = userService.queryById(item.getUserId());
                         if (sysUserVo != null) {
@@ -560,6 +567,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl<GpsEquipmentMapper, Gps
             .eq(GpsEquipment::getUserId, gpsEquipment.getUserId()));
         if (equipment == null) {
             gpsEquipment.setGpsType(1);
+            gpsEquipment.setClientType(0);
 //            gpsEquipment.setClientId(jsonObject.getStr("deviceId"));
             baseMapper.insert(gpsEquipment);
         }
@@ -627,5 +635,15 @@ public class GpsEquipmentServiceImpl extends ServiceImpl<GpsEquipmentMapper, Gps
             .isNull(GpsEquipment::getUserId).isNotNull(GpsEquipment::getClientId));
     }
 
+    /**
+     * 查询GPS人员或设备定位日期信息列表
+     * @param bo
+     * @return
+     */
+    @Override
+    public List<LocalDate> getRlList(GpsEquipmentSonBo bo) {
+        return gpsEquipmentSonService.getUserOrClientDate(bo);
+    }
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java

@@ -26,6 +26,7 @@ import org.dromara.gps.domain.GpsEquipmentSon;
 import org.dromara.gps.mapper.GpsEquipmentSonMapper;
 import org.dromara.gps.service.IGpsEquipmentSonService;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -247,4 +248,23 @@ public class GpsEquipmentSonServiceImpl extends ServiceImpl<GpsEquipmentSonMappe
             .eq(GpsEquipmentSon::getTripId,bo.getTripId())
             .orderByDesc(GpsEquipmentSon::getCreateTime));
     }
+
+    /**
+     * 查询GPS人员或设备定位日期信息列表
+     * @param bo
+     * @return
+     */
+    @Override
+    public List<LocalDate> getUserOrClientDate(GpsEquipmentSonBo bo) {
+        if (bo.getProjectId() == null) {
+            throw new ServiceException("项目id不能为空！");
+        }
+        if (bo.getClientId() == null && bo.getUserId() == null) {
+            throw new ServiceException("设备id或用户id不能为空！");
+        }
+        if (bo.getStartTime() == null || bo.getEndTime() == null) {
+            throw new ServiceException("开始时间和结算时间不能为空！！！");
+        }
+        return baseMapper.getUserOrClientDate(bo);
+    }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxController.java

@@ -0,0 +1,140 @@
+package org.dromara.mechanical.jxgl.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.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.device.service.IDeviceInfoService;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
+import org.dromara.system.service.impl.SysOssServiceImpl;
+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.mechanical.jxgl.domain.vo.JxGzwxVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
+import org.dromara.mechanical.jxgl.service.IJxGzwxService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 机械故障维修
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jxgl/gzwx")
+public class JxGzwxController extends BaseController {
+
+    private final IJxGzwxService jxGzwxService;
+
+
+    private final IDeviceInfoService deviceInfoService;
+
+
+
+
+
+    /**
+     * 查询设备信息列表
+     */
+    @SaCheckPermission("jxgl:gzwx:list")
+    @GetMapping("/getlist")
+    public TableDataInfo<DeviceInfoVo> list(DeviceInfoBo bo, PageQuery pageQuery) {
+        return deviceInfoService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询机械故障维修列表
+     */
+    @SaCheckPermission("jxgl:gzwx:list")
+    @GetMapping("/list")
+    public TableDataInfo<JxGzwxVo> list(JxGzwxBo bo, PageQuery pageQuery) {
+        return jxGzwxService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机械故障维修列表
+     */
+    @SaCheckPermission("jxgl:gzwx:export")
+    @Log(title = "机械故障维修", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(JxGzwxBo bo, HttpServletResponse response) {
+        List<JxGzwxVo> list = jxGzwxService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机械故障维修", JxGzwxVo.class, response);
+    }
+
+    /**
+     * 获取机械故障维修详细信息
+     *
+     * @param faultId 主键
+     */
+    @SaCheckPermission("jxgl:gzwx:query")
+    @GetMapping("/{faultId}")
+    public R<JxGzwxVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long faultId) {
+        return R.ok(jxGzwxService.queryById(faultId));
+    }
+
+    /**
+     * 新增机械故障维修
+     */
+    @SaCheckPermission("jxgl:gzwx:add")
+    @Log(title = "机械故障维修", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody JxGzwxBo bo) {
+        return toAjax(jxGzwxService.insertByBo(bo));
+    }
+
+    /**
+     * 修改机械故障维修
+     */
+    @SaCheckPermission("jxgl:gzwx:edit")
+    @Log(title = "机械故障维修", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody JxGzwxBo bo) {
+        return toAjax(jxGzwxService.updateByBo(bo));
+    }
+
+    /**
+     * 删除机械故障维修
+     *
+     * @param faultIds 主键串
+     */
+    @SaCheckPermission("jxgl:gzwx:remove")
+    @Log(title = "机械故障维修", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{faultIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] faultIds) {
+        return toAjax(jxGzwxService.deleteWithValidByIds(List.of(faultIds), true));
+    }
+
+    /**
+     * 机械故障头部数据返回
+     *
+     *
+     */
+    @SaCheckPermission("jxgl:gzwx:list")
+    @Log(title = "机械故障头部数据", businessType = BusinessType.DELETE)
+    @GetMapping("/jxgzwx")
+    public R<JxGzwxHeadVo> jxgzwx() {
+        return R.ok(jxGzwxService.jxgzwx());
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxJlController.java

@@ -0,0 +1,118 @@
+package org.dromara.mechanical.jxgl.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.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+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.mechanical.jxgl.domain.vo.JxGzwxJlVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo;
+import org.dromara.mechanical.jxgl.service.IJxGzwxJlService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 机械故障维修记录
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jxgl/gzwxJl")
+public class JxGzwxJlController extends BaseController {
+
+    private final IJxGzwxJlService jxGzwxJlService;
+
+    /**
+     * 查询机械故障维修记录列表
+     */
+    @SaCheckPermission("jxgl:gzwxJl:list")
+    @GetMapping("/list")
+    public TableDataInfo<JxGzwxJlVo> list(JxGzwxJlBo bo, PageQuery pageQuery) {
+        return jxGzwxJlService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机械故障维修记录列表
+     */
+    @SaCheckPermission("jxgl:gzwxJl:export")
+    @Log(title = "机械故障维修记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(JxGzwxJlBo bo, HttpServletResponse response) {
+        List<JxGzwxJlVo> list = jxGzwxJlService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机械故障维修记录", JxGzwxJlVo.class, response);
+    }
+
+    /**
+     * 获取机械故障维修记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("jxgl:gzwxJl:query")
+    @GetMapping("/{id}")
+    public R<JxGzwxJlVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(jxGzwxJlService.queryById(id));
+    }
+
+    /**
+     * 新增机械故障维修记录
+     */
+    @SaCheckPermission("jxgl:gzwxJl:add")
+    @Log(title = "机械故障维修记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody JxGzwxJlBo bo) {
+        return toAjax(jxGzwxJlService.insertByBo(bo));
+    }
+
+    /**
+     * 修改机械故障维修记录
+     */
+    @SaCheckPermission("jxgl:gzwxJl:edit")
+    @Log(title = "机械故障维修记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody JxGzwxJlBo bo) {
+        return toAjax(jxGzwxJlService.updateByBo(bo));
+    }
+
+    /**
+     * 删除机械故障维修记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("jxgl:gzwxJl:remove")
+    @Log(title = "机械故障维修记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(jxGzwxJlService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 机械故障记录头部数据返回
+     *
+     *
+     */
+    @SaCheckPermission("jxgl:gzwxJl:list")
+    @Log(title = "机械故障记录头部数据", businessType = BusinessType.DELETE)
+    @GetMapping("/jxgzwx")
+    public R<JxGzwxHeadVo> jxgzwx() {
+        return R.ok(jxGzwxJlService.jxgzwx());
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjhController.java

@@ -0,0 +1,138 @@
+package org.dromara.mechanical.jxgl.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.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.device.service.IDeviceInfoService;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
+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.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
+import org.dromara.mechanical.jxgl.service.IJxWhjhService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 机械维护计划
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jxgl/whjh")
+public class JxWhjhController extends BaseController {
+
+    private final IJxWhjhService jxWhjhService;
+
+    private final IDeviceInfoService deviceInfoService;
+
+
+
+
+
+    /**
+     * 查询设备信息列表
+     */
+    @SaCheckPermission("jxgl:whjh:list")
+    @GetMapping("/getlist")
+    public TableDataInfo<DeviceInfoVo> list(DeviceInfoBo bo, PageQuery pageQuery) {
+        return deviceInfoService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询机械维护计划列表
+     */
+    @SaCheckPermission("jxgl:whjh:list")
+    @GetMapping("/list")
+    public TableDataInfo<JxWhjhVo> list(JxWhjhBo bo, PageQuery pageQuery) {
+        return jxWhjhService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机械维护计划列表
+     */
+    @SaCheckPermission("jxgl:whjh:export")
+    @Log(title = "机械维护计划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(JxWhjhBo bo, HttpServletResponse response) {
+        List<JxWhjhVo> list = jxWhjhService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机械维护计划", JxWhjhVo.class, response);
+    }
+
+    /**
+     * 获取机械维护计划详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("jxgl:whjh:query")
+    @GetMapping("/{id}")
+    public R<JxWhjhVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(jxWhjhService.queryById(id));
+    }
+
+    /**
+     * 新增机械维护计划
+     */
+    @SaCheckPermission("jxgl:whjh:add")
+    @Log(title = "机械维护计划", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody JxWhjhBo bo) {
+        return toAjax(jxWhjhService.insertByBo(bo));
+    }
+
+    /**
+     * 修改机械维护计划
+     */
+    @SaCheckPermission("jxgl:whjh:edit")
+    @Log(title = "机械维护计划", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody JxWhjhBo bo) {
+        return toAjax(jxWhjhService.updateByBo(bo));
+    }
+
+    /**
+     * 删除机械维护计划
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("jxgl:whjh:remove")
+    @Log(title = "机械维护计划", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(jxWhjhService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    /**
+     * 机械维护计划头部数据返回
+     *
+     *
+     */
+    @SaCheckPermission("jxgl:whjh:list")
+    @Log(title = "机械维护计划", businessType = BusinessType.DELETE)
+    @GetMapping("/jxwh")
+    public R<JxWhjhHeadVo> jxwhHead() {
+        return R.ok(jxWhjhService.jxwhHead());
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java

@@ -0,0 +1,145 @@
+package org.dromara.mechanical.jxgl.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.dromara.device.domain.bo.DeviceInfoBo;
+import org.dromara.device.domain.vo.DeviceInfoVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
+import org.dromara.mechanical.jxgl.service.IJxWhjhService;
+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.mechanical.jxgl.domain.vo.JxWhjlVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo;
+import org.dromara.mechanical.jxgl.service.IJxWhjlService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 机械维护记录
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/jxgl/whjl")
+public class JxWhjlController extends BaseController {
+
+    private final IJxWhjlService jxWhjlService;
+
+    private final IJxWhjhService jxWhjhService;
+
+
+
+
+
+
+    /**
+     * 查询机械维护计划列表
+     */
+    @SaCheckPermission("jxgl:whjl:list")
+    @GetMapping("/getlist")
+    public TableDataInfo<JxWhjhVo> list(JxWhjhBo bo, PageQuery pageQuery) {
+        return jxWhjhService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询机械维护记录列表
+     */
+    @SaCheckPermission("jxgl:whjl:list")
+    @GetMapping("/list")
+    public TableDataInfo<JxWhjlVo> list(JxWhjlBo bo, PageQuery pageQuery) {
+        return jxWhjlService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出机械维护记录列表
+     */
+    @SaCheckPermission("jxgl:whjl:export")
+    @Log(title = "机械维护记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(JxWhjlBo bo, HttpServletResponse response) {
+        List<JxWhjlVo> list = jxWhjlService.queryList(bo);
+        ExcelUtil.exportExcel(list, "机械维护记录", JxWhjlVo.class, response);
+    }
+
+    /**
+     * 获取机械维护记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("jxgl:whjl:query")
+    @GetMapping("/{id}")
+    public R<JxWhjlVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(jxWhjlService.queryById(id));
+    }
+
+    /**
+     * 新增机械维护记录
+     */
+    @SaCheckPermission("jxgl:whjl:add")
+    @Log(title = "机械维护记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody JxWhjlBo bo) {
+        return toAjax(jxWhjlService.insertByBo(bo));
+    }
+
+    /**
+     * 修改机械维护记录
+     */
+    @SaCheckPermission("jxgl:whjl:edit")
+    @Log(title = "机械维护记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody JxWhjlBo bo) {
+        return toAjax(jxWhjlService.updateByBo(bo));
+    }
+
+    /**
+     * 删除机械维护记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("jxgl:whjl:remove")
+    @Log(title = "机械维护记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(jxWhjlService.deleteWithValidByIds(List.of(ids), true));
+    }
+    /**
+     * 机械维护记录头部数据返回
+     *
+     *
+     */
+    @SaCheckPermission("jxgl:whjl:list")
+    @Log(title = "机械维护记录头部数据", businessType = BusinessType.DELETE)
+    @GetMapping("/jxwjjl")
+    public R<JxWhjlHeadVo> jxwhHead() {
+        return R.ok(jxWhjlService.jxwhHead());
+    }
+
+
+
+
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwx.java

@@ -0,0 +1,91 @@
+package org.dromara.mechanical.jxgl.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 机械故障维修对象 jx_gzwx
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("jx_gzwx")
+public class JxGzwx extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 故障ID
+     */
+    @TableId(value = "fault_id")
+    private Long faultId;
+
+    /**
+     * 台账ID
+     */
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+    /**
+     * 故障发生时间
+     */
+    private LocalDateTime faultTime;
+
+    /**
+     * 故障类型 （发动机/液压系统/电器系统/底盘/其他）
+     */
+    private String faultType;
+
+    /**
+     * 故障描述
+     */
+    private String faultDescription;
+
+    /**
+     * 故障严重程度 （轻微/一般/严重/停机）
+     */
+    private String severity;
+
+    /**
+     * 维修预期完成日期
+     */
+    private LocalDate repairStartTime;
+
+    /**
+     * 状态  维修中 已恢复 关闭
+     */
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwxJl.java

@@ -0,0 +1,114 @@
+package org.dromara.mechanical.jxgl.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 机械故障维修记录对象 jx_gzwx_jl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("jx_gzwx_jl")
+public class JxGzwxJl extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 故障ID
+     */
+    private Long faultId;
+
+
+    /**
+     * 台账ID
+     */
+    private Long equipmentId;
+
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+    /**
+     * 维修开始时间
+     */
+    private LocalDateTime repairStartTime;
+
+    /**
+     * 维修结束时间
+     */
+    private LocalDateTime repairEndTime;
+
+    /**
+     * 维修人员
+     */
+    private Long repairPerson;
+
+    /**
+     * 维修内容
+     */
+    private String repairContent;
+
+    /**
+     * 更换配件
+     */
+    private String partsUsed;
+
+    /**
+     * 维修费用（材料费 + 工时费）
+     */
+    private BigDecimal repairCost;
+
+    /**
+     * 原因分析
+     */
+    private String faultCause;
+
+    /**
+     * 预防措施
+     */
+    private String preventiveActions;
+
+    /**
+     * 状态 维修中 已恢复 关闭
+     */
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjh.java

@@ -0,0 +1,103 @@
+package org.dromara.mechanical.jxgl.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.time.LocalDate;
+
+/**
+ * 机械维护计划对象 jx_whjh
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("jx_whjh")
+public class JxWhjh extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计划ID（主键）
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 台账ID（关联设备台账）
+     */
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+    /**
+     * 计划类型 字典
+     */
+    private String planType;
+
+    /**
+     * 保养级别 字典
+     */
+    private String maintenanceLevel;
+
+    /**
+     * 保养内容
+     */
+    private String maintenanceItems;
+
+    /**
+     * 周期类型 字典
+     */
+    private String cycleType;
+
+    /**
+     * 周期值
+     */
+    private BigDecimal cycleValue;
+
+    /**
+     * 计划开始日期
+     */
+    private LocalDate expectedStartDate;
+
+    /**
+     * 计划截止日期
+     */
+    private LocalDate expectedEndDate;
+
+    /**
+     * 负责人员
+     */
+    private Long responsiblePerson;
+
+    /**
+     * 状态 （未开始/进行中/已完成/逾期）
+     */
+    private String status;
+
+    /**
+     * 提前几天提醒
+     */
+    private Long remindBeforeDays;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjl.java

@@ -0,0 +1,96 @@
+package org.dromara.mechanical.jxgl.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.time.LocalDate;
+
+/**
+ * 机械维护记录对象 jx_whjl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("jx_whjl")
+public class JxWhjl extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 所属计划ID（可空，因为有些是临时保养）
+     */
+    private Long whjhId;
+
+    /**
+     * 台账ID
+     */
+    private Long equipmentId;
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+
+    /**
+     * 实际保养日期
+     */
+    private LocalDate maintenanceDate;
+
+    /**
+     * 当日/累计工时（用于判断周期）
+     */
+    private BigDecimal maintenanceHours;
+
+    /**
+     * 实际保养内容（JSON）
+     */
+    private String maintenanceItems;
+
+    /**
+     * 更换配件列表
+     */
+    private String partsReplaced;
+
+    /**
+     * 使用耗材（润滑油、滤芯等）
+     */
+    private String materialsUsed;
+
+    /**
+     * 执行人
+     */
+    private Long maintainer;
+
+    /**
+     * 保养结果（正常/异常/需复检）
+     */
+    private String maintenanceResult;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxBo.java

@@ -0,0 +1,95 @@
+package org.dromara.mechanical.jxgl.domain.bo;
+
+import org.dromara.mechanical.jxgl.domain.JxGzwx;
+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 java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 机械故障维修业务对象 jx_gzwx
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = JxGzwx.class, reverseConvertGenerate = false)
+public class JxGzwxBo extends BaseEntity {
+
+    /**
+     * 故障ID
+     */
+    private Long faultId;
+
+    /**
+     * 台账ID
+     */
+    @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
+
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String equipmentName;
+
+    /**
+     * 故障发生时间
+     */
+    @NotNull(message = "故障发生时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private LocalDateTime faultTime;
+
+    /**
+     * 故障类型 （发动机/液压系统/电器系统/底盘/其他）
+     */
+    @NotBlank(message = "故障类型 （发动机/液压系统/电器系统/底盘/其他）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String faultType;
+
+    /**
+     * 故障描述
+     */
+    @NotBlank(message = "故障描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String faultDescription;
+
+    /**
+     * 故障严重程度 （轻微/一般/严重/停机）
+     */
+    @NotBlank(message = "故障严重程度 （轻微/一般/严重/停机）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String severity;
+
+    /**
+     * 维修预期完成日期
+     */
+    private LocalDate repairStartTime;
+
+    /**
+     * 状态  维修中 已恢复 关闭
+     */
+    @NotBlank(message = "状态  维修中 已恢复 关闭不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxJlBo.java

@@ -0,0 +1,111 @@
+package org.dromara.mechanical.jxgl.domain.bo;
+
+import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
+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 java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 机械故障维修记录业务对象 jx_gzwx_jl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = JxGzwxJl.class, reverseConvertGenerate = false)
+public class JxGzwxJlBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 故障ID
+     */
+    @NotNull(message = "故障ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long faultId;
+
+    /**
+     * 台账ID
+     */
+    @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
+
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String equipmentName;
+
+    /**
+     * 维修开始时间
+     */
+    private LocalDateTime repairStartTime;
+
+    /**
+     * 维修结束时间
+     */
+    private LocalDateTime repairEndTime;
+
+    /**
+     * 维修人员
+     */
+    private Long repairPerson;
+
+    /**
+     * 维修内容
+     */
+    private String repairContent;
+
+    /**
+     * 更换配件
+     */
+    private String partsUsed;
+
+    /**
+     * 维修费用（材料费 + 工时费）
+     */
+    private BigDecimal repairCost;
+
+    /**
+     * 原因分析
+     */
+    private String faultCause;
+
+    /**
+     * 预防措施
+     */
+    private String preventiveActions;
+
+    /**
+     * 状态 维修中 已恢复 关闭
+     */
+    @NotBlank(message = "状态 维修中 已恢复 关闭不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjhBo.java

@@ -0,0 +1,109 @@
+package org.dromara.mechanical.jxgl.domain.bo;
+
+import org.dromara.mechanical.jxgl.domain.JxWhjh;
+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 java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 机械维护计划业务对象 jx_whjh
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = JxWhjh.class, reverseConvertGenerate = false)
+public class JxWhjhBo extends BaseEntity {
+
+    /**
+     * 计划ID（主键）
+     */
+    private Long id;
+
+    /**
+     * 台账ID（关联设备台账）
+     */
+    @NotNull(message = "台账ID（关联设备台账）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String equipmentName;
+
+    /**
+     * 计划类型 字典
+     */
+    @NotBlank(message = "计划类型 字典不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String planType;
+
+    /**
+     * 保养级别 字典
+     */
+    @NotBlank(message = "保养级别 字典不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String maintenanceLevel;
+
+    /**
+     * 保养内容
+     */
+    private String maintenanceItems;
+
+    /**
+     * 周期类型 字典
+     */
+    private String cycleType;
+
+    /**
+     * 周期值
+     */
+    private BigDecimal cycleValue;
+
+    /**
+     * 计划开始日期
+     */
+    @NotNull(message = "计划开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private LocalDate expectedStartDate;
+
+    /**
+     * 计划截止日期
+     */
+    @NotNull(message = "计划截止日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private LocalDate expectedEndDate;
+
+    /**
+     * 负责人员
+     */
+    @NotNull(message = "负责人员不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long responsiblePerson;
+
+    /**
+     * 状态 （未开始/进行中/已完成/逾期）
+     */
+    @NotBlank(message = "状态 （未开始/进行中/已完成/逾期）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 提前几天提醒
+     */
+    private Long remindBeforeDays;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjlBo.java

@@ -0,0 +1,97 @@
+package org.dromara.mechanical.jxgl.domain.bo;
+
+import org.dromara.mechanical.jxgl.domain.JxWhjl;
+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 java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 机械维护记录业务对象 jx_whjl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = JxWhjl.class, reverseConvertGenerate = false)
+public class JxWhjlBo extends BaseEntity {
+
+    /**
+     * 记录ID
+     */
+    private Long id;
+
+    /**
+     * 所属计划ID（可空，因为有些是临时保养）
+     */
+    private Long whjhId;
+
+    /**
+     * 台账ID
+     */
+    @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
+    /**
+     * 设备名称/型号（显示用）
+     */
+    @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String equipmentName;
+
+
+    /**
+     * 实际保养日期
+     */
+    @NotNull(message = "实际保养日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private LocalDate maintenanceDate;
+
+    /**
+     * 当日/累计工时（用于判断周期）
+     */
+    @NotNull(message = "当日/累计工时（用于判断周期）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal maintenanceHours;
+
+    /**
+     * 实际保养内容（JSON）
+     */
+    private String maintenanceItems;
+
+    /**
+     * 更换配件列表
+     */
+    private String partsReplaced;
+
+    /**
+     * 使用耗材（润滑油、滤芯等）
+     */
+    private String materialsUsed;
+
+    /**
+     * 执行人
+     */
+    @NotNull(message = "执行人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long maintainer;
+
+    /**
+     * 保养结果（正常/异常/需复检）
+     */
+    @NotBlank(message = "保养结果（正常/异常/需复检）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String maintenanceResult;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxHeadVo.java

@@ -0,0 +1,21 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class JxGzwxHeadVo implements Serializable {
+
+    //总计划数
+    private Long zs = 0L;
+
+    //待处理
+    private Long dcl = 0L;
+
+    //    已完成
+    private Long ywc = 0L;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxJlVo.java

@@ -0,0 +1,137 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import java.math.BigDecimal;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
+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.time.LocalDateTime;
+import java.util.Date;
+
+
+
+/**
+ * 机械故障维修记录视图对象 jx_gzwx_jl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = JxGzwxJl.class)
+public class JxGzwxJlVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 台账ID
+     */
+    private Long equipmentId;
+
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+    /**
+     * 故障ID
+     */
+    @ExcelProperty(value = "故障ID")
+    private Long faultId;
+
+    /**
+     * 维修开始时间
+     */
+    @ExcelProperty(value = "维修开始时间")
+    private LocalDateTime repairStartTime;
+
+    /**
+     * 维修结束时间
+     */
+    @ExcelProperty(value = "维修结束时间")
+    private LocalDateTime repairEndTime;
+
+    /**
+     * 维修人员
+     */
+    @ExcelProperty(value = "维修人员")
+    private Long repairPerson;
+
+    /**
+     * 维修内容
+     */
+    @ExcelProperty(value = "维修内容")
+    private String repairContent;
+
+    /**
+     * 更换配件
+     */
+    @ExcelProperty(value = "更换配件")
+    private String partsUsed;
+
+    /**
+     * 维修费用（材料费 + 工时费）
+     */
+    @ExcelProperty(value = "维修费用", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "材=料费,+=,工=时费")
+    private BigDecimal repairCost;
+
+    /**
+     * 原因分析
+     */
+    @ExcelProperty(value = "原因分析 ")
+    private String faultCause;
+
+    /**
+     * 预防措施
+     */
+    @ExcelProperty(value = "预防措施")
+    private String preventiveActions;
+
+    /**
+     * 状态 维修中 已恢复 关闭
+     */
+    @ExcelProperty(value = "状态 维修中 已恢复 关闭", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_gzwxzt")
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    @ExcelProperty(value = "故障照片、维修工单")
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxVo.java

@@ -0,0 +1,112 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import jakarta.validation.constraints.NotBlank;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.mechanical.jxgl.domain.JxGzwx;
+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.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+
+
+/**
+ * 机械故障维修视图对象 jx_gzwx
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = JxGzwx.class)
+public class JxGzwxVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 故障ID
+     */
+    @ExcelProperty(value = "故障ID")
+    private Long faultId;
+
+    /**
+     * 台账ID
+     */
+    @ExcelProperty(value = "台账ID")
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+    /**
+     * 故障发生时间
+     */
+    @ExcelProperty(value = "故障发生时间")
+    private LocalDateTime faultTime;
+
+    /**
+     * 故障类型 （发动机/液压系统/电器系统/底盘/其他）
+     */
+    @ExcelProperty(value = "故障类型 ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_gzlx")
+    private String faultType;
+
+    /**
+     * 故障描述
+     */
+    @ExcelProperty(value = "故障描述")
+    private String faultDescription;
+
+    /**
+     * 故障严重程度 （轻微/一般/严重/停机）
+     */
+    @ExcelProperty(value = "故障严重程度 ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_gzyzcd")
+    private String severity;
+
+    /**
+     * 维修预期完成日期
+     */
+    @ExcelProperty(value = "维修预期完成日期")
+    private LocalDate repairStartTime;
+
+    /**
+     * 状态  维修中 已恢复 关闭
+     */
+    @ExcelProperty(value = "状态  维修中 已恢复 关闭", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_gzwxzt")
+    private String status;
+
+    /**
+     * 故障照片、维修工单
+     */
+    @ExcelProperty(value = "故障照片、维修工单")
+    private String attachments;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhHeadVo.java

@@ -0,0 +1,23 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class JxWhjhHeadVo implements Serializable {
+    //总计划数
+    private Long zs = 0L;
+
+    //未完成
+    private Long wwc = 0L;
+    //已完成
+    private Long ywc = 0L;
+    //逾期
+    private Long yq = 0L;
+
+
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhVo.java

@@ -0,0 +1,132 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import java.math.BigDecimal;
+import org.dromara.mechanical.jxgl.domain.JxWhjh;
+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.time.LocalDate;
+import java.util.Date;
+
+
+
+/**
+ * 机械维护计划视图对象 jx_whjh
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = JxWhjh.class)
+public class JxWhjhVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计划ID（主键）
+     */
+    @ExcelProperty(value = "计划ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "主=键")
+    private Long id;
+
+    /**
+     * 台账ID（关联设备台账）
+     */
+    @ExcelProperty(value = "台账ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "关=联设备台账")
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    @ExcelProperty(value = "设备名称/型号", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "显=示用")
+    private String equipmentName;
+
+    /**
+     * 计划类型 字典
+     */
+    @ExcelProperty(value = "计划类型 字典", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_jhlx")
+    private String planType;
+
+    /**
+     * 保养级别 字典
+     */
+    @ExcelProperty(value = "保养级别 字典", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_byjb")
+    private String maintenanceLevel;
+
+    /**
+     * 保养内容
+     */
+    @ExcelProperty(value = "保养内容")
+    private String maintenanceItems;
+
+    /**
+     * 周期类型 字典
+     */
+    @ExcelProperty(value = "周期类型 字典", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_zqlx")
+    private String cycleType;
+
+    /**
+     * 周期值
+     */
+    @ExcelProperty(value = "周期值")
+    private BigDecimal cycleValue;
+
+    /**
+     * 计划开始日期
+     */
+    @ExcelProperty(value = "计划开始日期")
+    private LocalDate expectedStartDate;
+
+    /**
+     * 计划截止日期
+     */
+    @ExcelProperty(value = "计划截止日期")
+    private LocalDate expectedEndDate;
+
+    /**
+     * 负责人员
+     */
+    @ExcelProperty(value = "负责人员")
+    private Long responsiblePerson;
+
+    /**
+     * 状态 （未开始/进行中/已完成/逾期）
+     */
+    @ExcelProperty(value = "状态 ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "jx_whjhzt")
+    private String status;
+
+    /**
+     * 提前几天提醒
+     */
+    @ExcelProperty(value = "提前几天提醒")
+    private Long remindBeforeDays;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlHeadVo.java

@@ -0,0 +1,17 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class JxWhjlHeadVo implements Serializable {
+    //总数
+    private Long zs = 0L;
+    //正常
+    private Long zc = 0L;
+    //异常
+    private Long yc = 0L;
+    //需复检
+    private Long xfc = 0L;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlVo.java

@@ -0,0 +1,122 @@
+package org.dromara.mechanical.jxgl.domain.vo;
+
+import java.math.BigDecimal;
+
+import jakarta.validation.constraints.NotBlank;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.mechanical.jxgl.domain.JxWhjl;
+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.time.LocalDate;
+import java.util.Date;
+
+
+
+/**
+ * 机械维护记录视图对象 jx_whjl
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = JxWhjl.class)
+public class JxWhjlVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录ID
+     */
+    @ExcelProperty(value = "记录ID")
+    private Long id;
+
+    /**
+     * 所属计划ID（可空，因为有些是临时保养）
+     */
+    @ExcelProperty(value = "所属计划ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "可=空，因为有些是临时保养")
+    private Long whjhId;
+
+    /**
+     * 台账ID
+     */
+    @ExcelProperty(value = "台账ID")
+    private Long equipmentId;
+
+    /**
+     * 设备名称/型号（显示用）
+     */
+    private String equipmentName;
+
+
+    /**
+     * 实际保养日期
+     */
+    @ExcelProperty(value = "实际保养日期")
+    private LocalDate maintenanceDate;
+
+    /**
+     * 当日/累计工时（用于判断周期）
+     */
+    @ExcelProperty(value = "当日/累计工时", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "用=于判断周期")
+    private BigDecimal maintenanceHours;
+
+    /**
+     * 实际保养内容（JSON）
+     */
+    @ExcelProperty(value = "实际保养内容", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "J=SON")
+    private String maintenanceItems;
+
+    /**
+     * 更换配件列表
+     */
+    @ExcelProperty(value = "更换配件列表")
+    private String partsReplaced;
+
+    /**
+     * 使用耗材（润滑油、滤芯等）
+     */
+    @ExcelProperty(value = "使用耗材", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "润=滑油、滤芯等")
+    private String materialsUsed;
+
+    /**
+     * 执行人
+     */
+    @ExcelProperty(value = "执行人")
+    private Long maintainer;
+
+    /**
+     * 保养结果（正常/异常/需复检）
+     */
+    @ExcelProperty(value = "保养结果", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "正=常/异常/需复检")
+    private String maintenanceResult;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 文件id （多个文件逗号分隔）
+     */
+    @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
+    private String fileId;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxJlMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mechanical.jxgl.mapper;
+
+import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械故障维修记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface JxGzwxJlMapper extends BaseMapperPlus<JxGzwxJl, JxGzwxJlVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mechanical.jxgl.mapper;
+
+import org.dromara.mechanical.jxgl.domain.JxGzwx;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械故障维修Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface JxGzwxMapper extends BaseMapperPlus<JxGzwx, JxGzwxVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjhMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mechanical.jxgl.mapper;
+
+import org.dromara.mechanical.jxgl.domain.JxWhjh;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械维护计划Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface JxWhjhMapper extends BaseMapperPlus<JxWhjh, JxWhjhVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjlMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mechanical.jxgl.mapper;
+
+import org.dromara.mechanical.jxgl.domain.JxWhjl;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 机械维护记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface JxWhjlMapper extends BaseMapperPlus<JxWhjl, JxWhjlVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxJlService.java

@@ -0,0 +1,73 @@
+package org.dromara.mechanical.jxgl.service;
+
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo;
+import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 机械故障维修记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IJxGzwxJlService extends IService<JxGzwxJl>{
+
+    /**
+     * 查询机械故障维修记录
+     *
+     * @param id 主键
+     * @return 机械故障维修记录
+     */
+    JxGzwxJlVo queryById(Long id);
+
+    /**
+     * 分页查询机械故障维修记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械故障维修记录分页列表
+     */
+    TableDataInfo<JxGzwxJlVo> queryPageList(JxGzwxJlBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的机械故障维修记录列表
+     *
+     * @param bo 查询条件
+     * @return 机械故障维修记录列表
+     */
+    List<JxGzwxJlVo> queryList(JxGzwxJlBo bo);
+
+    /**
+     * 新增机械故障维修记录
+     *
+     * @param bo 机械故障维修记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(JxGzwxJlBo bo);
+
+    /**
+     * 修改机械故障维修记录
+     *
+     * @param bo 机械故障维修记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(JxGzwxJlBo bo);
+
+    /**
+     * 校验并批量删除机械故障维修记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    JxGzwxHeadVo jxgzwx();
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxService.java

@@ -0,0 +1,73 @@
+package org.dromara.mechanical.jxgl.service;
+
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
+import org.dromara.mechanical.jxgl.domain.JxGzwx;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 机械故障维修Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IJxGzwxService extends IService<JxGzwx>{
+
+    /**
+     * 查询机械故障维修
+     *
+     * @param faultId 主键
+     * @return 机械故障维修
+     */
+    JxGzwxVo queryById(Long faultId);
+
+    /**
+     * 分页查询机械故障维修列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械故障维修分页列表
+     */
+    TableDataInfo<JxGzwxVo> queryPageList(JxGzwxBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的机械故障维修列表
+     *
+     * @param bo 查询条件
+     * @return 机械故障维修列表
+     */
+    List<JxGzwxVo> queryList(JxGzwxBo bo);
+
+    /**
+     * 新增机械故障维修
+     *
+     * @param bo 机械故障维修
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(JxGzwxBo bo);
+
+    /**
+     * 修改机械故障维修
+     *
+     * @param bo 机械故障维修
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(JxGzwxBo bo);
+
+    /**
+     * 校验并批量删除机械故障维修信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    JxGzwxHeadVo jxgzwx();
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjhService.java

@@ -0,0 +1,73 @@
+package org.dromara.mechanical.jxgl.service;
+
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
+import org.dromara.mechanical.jxgl.domain.JxWhjh;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 机械维护计划Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IJxWhjhService extends IService<JxWhjh>{
+
+    /**
+     * 查询机械维护计划
+     *
+     * @param id 主键
+     * @return 机械维护计划
+     */
+    JxWhjhVo queryById(Long id);
+
+    /**
+     * 分页查询机械维护计划列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械维护计划分页列表
+     */
+    TableDataInfo<JxWhjhVo> queryPageList(JxWhjhBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的机械维护计划列表
+     *
+     * @param bo 查询条件
+     * @return 机械维护计划列表
+     */
+    List<JxWhjhVo> queryList(JxWhjhBo bo);
+
+    /**
+     * 新增机械维护计划
+     *
+     * @param bo 机械维护计划
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(JxWhjhBo bo);
+
+    /**
+     * 修改机械维护计划
+     *
+     * @param bo 机械维护计划
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(JxWhjhBo bo);
+
+    /**
+     * 校验并批量删除机械维护计划信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    JxWhjhHeadVo jxwhHead();
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjlService.java

@@ -0,0 +1,73 @@
+package org.dromara.mechanical.jxgl.service;
+
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo;
+import org.dromara.mechanical.jxgl.domain.JxWhjl;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 机械维护记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+public interface IJxWhjlService extends IService<JxWhjl>{
+
+    /**
+     * 查询机械维护记录
+     *
+     * @param id 主键
+     * @return 机械维护记录
+     */
+    JxWhjlVo queryById(Long id);
+
+    /**
+     * 分页查询机械维护记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械维护记录分页列表
+     */
+    TableDataInfo<JxWhjlVo> queryPageList(JxWhjlBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的机械维护记录列表
+     *
+     * @param bo 查询条件
+     * @return 机械维护记录列表
+     */
+    List<JxWhjlVo> queryList(JxWhjlBo bo);
+
+    /**
+     * 新增机械维护记录
+     *
+     * @param bo 机械维护记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(JxWhjlBo bo);
+
+    /**
+     * 修改机械维护记录
+     *
+     * @param bo 机械维护记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(JxWhjlBo bo);
+
+    /**
+     * 校验并批量删除机械维护记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    JxWhjlHeadVo jxwhHead();
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java

@@ -0,0 +1,171 @@
+package org.dromara.mechanical.jxgl.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.dromara.mechanical.jxgl.domain.JxGzwx;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+import org.dromara.mechanical.jxgl.service.IJxGzwxService;
+import org.springframework.stereotype.Service;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
+import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
+import org.dromara.mechanical.jxgl.mapper.JxGzwxJlMapper;
+import org.dromara.mechanical.jxgl.service.IJxGzwxJlService;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 机械故障维修记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class JxGzwxJlServiceImpl extends ServiceImpl<JxGzwxJlMapper, JxGzwxJl> implements IJxGzwxJlService {
+
+    private final JxGzwxJlMapper baseMapper;
+
+    private final IJxGzwxService jxGzwxService;
+
+    /**
+     * 查询机械故障维修记录
+     *
+     * @param id 主键
+     * @return 机械故障维修记录
+     */
+    @Override
+    public JxGzwxJlVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询机械故障维修记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械故障维修记录分页列表
+     */
+    @Override
+    public TableDataInfo<JxGzwxJlVo> queryPageList(JxGzwxJlBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<JxGzwxJl> lqw = buildQueryWrapper(bo);
+        Page<JxGzwxJlVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的机械故障维修记录列表
+     *
+     * @param bo 查询条件
+     * @return 机械故障维修记录列表
+     */
+    @Override
+    public List<JxGzwxJlVo> queryList(JxGzwxJlBo bo) {
+        LambdaQueryWrapper<JxGzwxJl> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<JxGzwxJl> buildQueryWrapper(JxGzwxJlBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<JxGzwxJl> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(JxGzwxJl::getId);
+        lqw.eq(bo.getFaultId() != null, JxGzwxJl::getFaultId, bo.getFaultId());
+        lqw.eq(bo.getRepairStartTime() != null, JxGzwxJl::getRepairStartTime, bo.getRepairStartTime());
+        lqw.eq(bo.getRepairEndTime() != null, JxGzwxJl::getRepairEndTime, bo.getRepairEndTime());
+        lqw.eq(bo.getRepairPerson() != null, JxGzwxJl::getRepairPerson, bo.getRepairPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getRepairContent()), JxGzwxJl::getRepairContent, bo.getRepairContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartsUsed()), JxGzwxJl::getPartsUsed, bo.getPartsUsed());
+        lqw.eq(bo.getRepairCost() != null, JxGzwxJl::getRepairCost, bo.getRepairCost());
+        lqw.eq(StringUtils.isNotBlank(bo.getFaultCause()), JxGzwxJl::getFaultCause, bo.getFaultCause());
+        lqw.eq(StringUtils.isNotBlank(bo.getPreventiveActions()), JxGzwxJl::getPreventiveActions, bo.getPreventiveActions());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxGzwxJl::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getAttachments()), JxGzwxJl::getAttachments, bo.getAttachments());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxGzwxJl::getFileId, bo.getFileId());
+        return lqw;
+    }
+
+    /**
+     * 新增机械故障维修记录
+     *
+     * @param bo 机械故障维修记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(JxGzwxJlBo bo) {
+        JxGzwxJl add = MapstructUtils.convert(bo, JxGzwxJl.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (bo != null){
+            jxGzwxService.getBaseMapper().update(new UpdateWrapper<JxGzwx>().eq("fault_id", bo.getFaultId()).set("status",bo.getStatus()));
+        }
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改机械故障维修记录
+     *
+     * @param bo 机械故障维修记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(JxGzwxJlBo bo) {
+        JxGzwxJl update = MapstructUtils.convert(bo, JxGzwxJl.class);
+        validEntityBeforeSave(update);
+        if (bo != null){
+            jxGzwxService.getBaseMapper().update(new UpdateWrapper<JxGzwx>().eq("fault_id", bo.getFaultId()).set("status",bo.getStatus()));
+        }
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(JxGzwxJl entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除机械故障维修记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public JxGzwxHeadVo jxgzwx() {
+        JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo();
+        List<JxGzwxJl> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwxJl>().ge(JxGzwxJl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
+        if (jxGzwxes != null && jxGzwxes.size() > 0) {
+            long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count();
+            long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count();
+
+            jxGzwxHeadVo.setDcl(wxz);
+            jxGzwxHeadVo.setZs(Long.valueOf(jxGzwxes.size()));
+            jxGzwxHeadVo.setYwc(hf);
+        }
+        return jxGzwxHeadVo;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java

@@ -0,0 +1,178 @@
+package org.dromara.mechanical.jxgl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.dromara.mechanical.jxgl.domain.JxWhjh;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
+import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.springframework.stereotype.Service;
+import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
+import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
+import org.dromara.mechanical.jxgl.domain.JxGzwx;
+import org.dromara.mechanical.jxgl.mapper.JxGzwxMapper;
+import org.dromara.mechanical.jxgl.service.IJxGzwxService;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+
+/**
+ * 机械故障维修Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> implements IJxGzwxService {
+
+    private final JxGzwxMapper baseMapper;
+
+    private final SysOssServiceImpl sysOssService;
+
+    /**
+     * 查询机械故障维修
+     *
+     * @param faultId 主键
+     * @return 机械故障维修
+     */
+    @Override
+    public JxGzwxVo queryById(Long faultId){
+        return baseMapper.selectVoById(faultId);
+    }
+
+    /**
+     * 分页查询机械故障维修列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械故障维修分页列表
+     */
+    @Override
+    public TableDataInfo<JxGzwxVo> queryPageList(JxGzwxBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<JxGzwx> lqw = buildQueryWrapper(bo);
+        Page<JxGzwxVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的机械故障维修列表
+     *
+     * @param bo 查询条件
+     * @return 机械故障维修列表
+     */
+    @Override
+    public List<JxGzwxVo> queryList(JxGzwxBo bo) {
+        LambdaQueryWrapper<JxGzwx> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<JxGzwx> buildQueryWrapper(JxGzwxBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<JxGzwx> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(JxGzwx::getFaultId);
+        lqw.eq(bo.getEquipmentId() != null, JxGzwx::getEquipmentId, bo.getEquipmentId());
+        lqw.eq(bo.getFaultTime() != null, JxGzwx::getFaultTime, bo.getFaultTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getFaultType()), JxGzwx::getFaultType, bo.getFaultType());
+        lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), JxGzwx::getFaultDescription, bo.getFaultDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getSeverity()), JxGzwx::getSeverity, bo.getSeverity());
+        lqw.eq(bo.getRepairStartTime() != null, JxGzwx::getRepairStartTime, bo.getRepairStartTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxGzwx::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getAttachments()), JxGzwx::getAttachments, bo.getAttachments());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxGzwx::getFileId, bo.getFileId());
+        return lqw;
+    }
+
+    /**
+     * 新增机械故障维修
+     *
+     * @param bo 机械故障维修
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(JxGzwxBo bo) {
+        JxGzwx add = MapstructUtils.convert(bo, JxGzwx.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setFaultId(add.getFaultId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改机械故障维修
+     *
+     * @param bo 机械故障维修
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(JxGzwxBo bo) {
+        JxGzwx update = MapstructUtils.convert(bo, JxGzwx.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(JxGzwx entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除机械故障维修信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+
+        List<Long> deleteIds = new ArrayList<>();
+        for (Long id : ids) {
+            JxGzwxVo vo = baseMapper.selectVoById(id);
+            if (vo != null){
+                //删除附件
+                if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){
+                    List<Long> list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList();
+                    deleteIds.addAll(list);
+                }
+            }
+        }
+        if (!deleteIds.isEmpty()) {
+            sysOssService.deleteWithValidByIds(deleteIds, false);
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public JxGzwxHeadVo jxgzwx() {
+
+        JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo();
+        List<JxGzwx> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwx>().ge(JxGzwx::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
+        if (jxGzwxes != null && jxGzwxes.size() > 0) {
+            long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count();
+            long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count();
+
+            jxGzwxHeadVo.setDcl(wxz);
+            jxGzwxHeadVo.setZs(Long.valueOf(jxGzwxes.size()));
+            jxGzwxHeadVo.setYwc(hf);
+        }
+
+
+        return jxGzwxHeadVo;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java

@@ -0,0 +1,177 @@
+package org.dromara.mechanical.jxgl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
+import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.dromara.xzd.settlement.domain.vo.XzdJsSjJungonVo;
+import org.springframework.stereotype.Service;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.mechanical.jxgl.domain.JxWhjh;
+import org.dromara.mechanical.jxgl.mapper.JxWhjhMapper;
+import org.dromara.mechanical.jxgl.service.IJxWhjhService;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+
+/**
+ * 机械维护计划Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> implements IJxWhjhService {
+
+    private final JxWhjhMapper baseMapper;
+    private final SysOssServiceImpl sysOssService;
+
+    /**
+     * 查询机械维护计划
+     *
+     * @param id 主键
+     * @return 机械维护计划
+     */
+    @Override
+    public JxWhjhVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询机械维护计划列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械维护计划分页列表
+     */
+    @Override
+    public TableDataInfo<JxWhjhVo> queryPageList(JxWhjhBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<JxWhjh> lqw = buildQueryWrapper(bo);
+        Page<JxWhjhVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的机械维护计划列表
+     *
+     * @param bo 查询条件
+     * @return 机械维护计划列表
+     */
+    @Override
+    public List<JxWhjhVo> queryList(JxWhjhBo bo) {
+        LambdaQueryWrapper<JxWhjh> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<JxWhjh> buildQueryWrapper(JxWhjhBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<JxWhjh> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(JxWhjh::getId);
+        lqw.eq(bo.getEquipmentId() != null, JxWhjh::getEquipmentId, bo.getEquipmentId());
+        lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), JxWhjh::getEquipmentName, bo.getEquipmentName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlanType()), JxWhjh::getPlanType, bo.getPlanType());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceLevel()), JxWhjh::getMaintenanceLevel, bo.getMaintenanceLevel());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItems()), JxWhjh::getMaintenanceItems, bo.getMaintenanceItems());
+        lqw.eq(StringUtils.isNotBlank(bo.getCycleType()), JxWhjh::getCycleType, bo.getCycleType());
+        lqw.eq(bo.getCycleValue() != null, JxWhjh::getCycleValue, bo.getCycleValue());
+        lqw.eq(bo.getExpectedStartDate() != null, JxWhjh::getExpectedStartDate, bo.getExpectedStartDate());
+        lqw.eq(bo.getExpectedEndDate() != null, JxWhjh::getExpectedEndDate, bo.getExpectedEndDate());
+        lqw.eq(bo.getResponsiblePerson() != null, JxWhjh::getResponsiblePerson, bo.getResponsiblePerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxWhjh::getStatus, bo.getStatus());
+        lqw.eq(bo.getRemindBeforeDays() != null, JxWhjh::getRemindBeforeDays, bo.getRemindBeforeDays());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxWhjh::getFileId, bo.getFileId());
+        return lqw;
+    }
+
+    /**
+     * 新增机械维护计划
+     *
+     * @param bo 机械维护计划
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(JxWhjhBo bo) {
+        JxWhjh add = MapstructUtils.convert(bo, JxWhjh.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改机械维护计划
+     *
+     * @param bo 机械维护计划
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(JxWhjhBo bo) {
+        JxWhjh update = MapstructUtils.convert(bo, JxWhjh.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(JxWhjh entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除机械维护计划信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        List<Long> deleteIds = new ArrayList<>();
+        for (Long id : ids) {
+            JxWhjhVo vo = baseMapper.selectVoById(id);
+            if (vo != null){
+                //删除附件
+                if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){
+                    List<Long> list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList();
+                    deleteIds.addAll(list);
+                }
+            }
+        }
+        if (!deleteIds.isEmpty()) {
+            sysOssService.deleteWithValidByIds(deleteIds, false);
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public JxWhjhHeadVo jxwhHead() {
+        JxWhjhHeadVo jxWhjhHeadVo = new JxWhjhHeadVo();
+        List<JxWhjh> jxWhjhs = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjh>().ge(JxWhjh::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
+        if (jxWhjhs != null && jxWhjhs.size() > 0) {
+            long countwwc = jxWhjhs.stream().filter(jxwhjh -> "1".equals(jxwhjh.getStatus()) || "2".equals(jxwhjh.getStatus())).count();
+            long countywc = jxWhjhs.stream().filter(jxwhjh ->  "3".equals(jxwhjh.getStatus())).count();
+            long countyq = jxWhjhs.stream().filter(jxwhjh ->  "4".equals(jxwhjh.getStatus())).count();
+            jxWhjhHeadVo.setWwc(countwwc);
+            jxWhjhHeadVo.setYq(countyq);
+            jxWhjhHeadVo.setYwc(countywc);
+            jxWhjhHeadVo.setZs(Long.valueOf(jxWhjhs.size()));
+        }
+        return jxWhjhHeadVo;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java

@@ -0,0 +1,200 @@
+package org.dromara.mechanical.jxgl.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.dromara.mechanical.jxgl.domain.JxWhjh;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
+import org.dromara.mechanical.jxgl.service.IJxWhjhService;
+import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.springframework.stereotype.Service;
+import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo;
+import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
+import org.dromara.mechanical.jxgl.domain.JxWhjl;
+import org.dromara.mechanical.jxgl.mapper.JxWhjlMapper;
+import org.dromara.mechanical.jxgl.service.IJxWhjlService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+
+/**
+ * 机械维护记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-01
+ */
+@RequiredArgsConstructor
+@Service
+public class JxWhjlServiceImpl extends ServiceImpl<JxWhjlMapper, JxWhjl> implements IJxWhjlService {
+
+    private final JxWhjlMapper baseMapper;
+
+    private final IJxWhjhService jxWhjhService;
+
+    private final SysOssServiceImpl sysOssService;
+
+
+    /**
+     * 查询机械维护记录
+     *
+     * @param id 主键
+     * @return 机械维护记录
+     */
+    @Override
+    public JxWhjlVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询机械维护记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 机械维护记录分页列表
+     */
+    @Override
+    public TableDataInfo<JxWhjlVo> queryPageList(JxWhjlBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<JxWhjl> lqw = buildQueryWrapper(bo);
+        Page<JxWhjlVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的机械维护记录列表
+     *
+     * @param bo 查询条件
+     * @return 机械维护记录列表
+     */
+    @Override
+    public List<JxWhjlVo> queryList(JxWhjlBo bo) {
+        LambdaQueryWrapper<JxWhjl> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<JxWhjl> buildQueryWrapper(JxWhjlBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<JxWhjl> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(JxWhjl::getId);
+        lqw.eq(bo.getWhjhId() != null, JxWhjl::getWhjhId, bo.getWhjhId());
+        lqw.eq(bo.getEquipmentId() != null, JxWhjl::getEquipmentId, bo.getEquipmentId());
+        lqw.eq(bo.getMaintenanceDate() != null, JxWhjl::getMaintenanceDate, bo.getMaintenanceDate());
+        lqw.eq(bo.getMaintenanceHours() != null, JxWhjl::getMaintenanceHours, bo.getMaintenanceHours());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItems()), JxWhjl::getMaintenanceItems, bo.getMaintenanceItems());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartsReplaced()), JxWhjl::getPartsReplaced, bo.getPartsReplaced());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaterialsUsed()), JxWhjl::getMaterialsUsed, bo.getMaterialsUsed());
+        lqw.eq(bo.getMaintainer() != null, JxWhjl::getMaintainer, bo.getMaintainer());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceResult()), JxWhjl::getMaintenanceResult, bo.getMaintenanceResult());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxWhjl::getFileId, bo.getFileId());
+        return lqw;
+    }
+
+    /**
+     * 新增机械维护记录
+     *
+     * @param bo 机械维护记录
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(JxWhjlBo bo) {
+        JxWhjl add = MapstructUtils.convert(bo, JxWhjl.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (bo != null){
+            if ("1".equals(bo.getMaintenanceResult())){
+                jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","3"));
+            }else {
+                jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","2"));
+
+            }
+        }
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改机械维护记录
+     *
+     * @param bo 机械维护记录
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(JxWhjlBo bo) {
+        JxWhjl update = MapstructUtils.convert(bo, JxWhjl.class);
+        validEntityBeforeSave(update);
+        if (update != null){
+            if ("1".equals(update.getMaintenanceResult())){
+                jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","3"));
+            }else {
+                jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","2"));
+            }
+        }
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(JxWhjl entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除机械维护记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        List<Long> deleteIds = new ArrayList<>();
+        for (Long id : ids) {
+            JxWhjlVo vo = baseMapper.selectVoById(id);
+            if (vo != null){
+                //删除附件
+                if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){
+                    List<Long> list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList();
+                    deleteIds.addAll(list);
+                }
+            }
+        }
+        if (!deleteIds.isEmpty()) {
+            sysOssService.deleteWithValidByIds(deleteIds, false);
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public JxWhjlHeadVo jxwhHead() {
+
+        JxWhjlHeadVo jxWhjlHeadVo = new JxWhjlHeadVo();
+        List<JxWhjl> jxWhjls = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjl>().ge(JxWhjl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
+        if (jxWhjls != null && jxWhjls.size() > 0) {
+            long zc = jxWhjls.stream().filter(jxwhjl -> "1".equals(jxwhjl.getMaintenanceResult())).count();
+            long yc = jxWhjls.stream().filter(jxwhjl -> "2".equals(jxwhjl.getMaintenanceResult())).count();
+            long fc = jxWhjls.stream().filter(jxwhjl -> "3".equals(jxwhjl.getMaintenanceResult())).count();
+            jxWhjlHeadVo.setZs(Long.valueOf(jxWhjls.size()));
+            jxWhjlHeadVo.setZc(zc);
+            jxWhjlHeadVo.setYc(yc);
+            jxWhjlHeadVo.setXfc(fc);
+        }
+        return jxWhjlHeadVo;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java

@@ -18,7 +18,7 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.out.domain.bo.OutConstructionValueBo;
 import org.dromara.out.domain.bo.OutConstructionValueFacilityReq;
 import org.dromara.out.domain.vo.OutConstructionAllValueVo;
-import org.dromara.out.domain.vo.OutConstructionValueVo;
+import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo;
 import org.dromara.out.service.IOutConstructionValueService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -59,6 +59,16 @@ public class OutConstructionValueController extends BaseController {
         ExcelUtil.exportExcel(list, "施工产值", OutConstructionValueVo.class, response);
     }
 
+    /**
+     * 导出施工产值范围列表
+     */
+    @SaCheckPermission("out:constructionValue:export")
+    @Log(title = "施工产值", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportByProject")
+    public void exportByProject(OutConstructionValueBo bo, HttpServletResponse response) {
+        outConstructionValueService.exportExcel(bo, response);
+    }
+
     /**
      * 获取施工产值详细信息
      *

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueRangeController.java

@@ -23,8 +23,8 @@ import org.dromara.out.domain.OutConstructionValue;
 import org.dromara.out.domain.OutConstructionValueRange;
 import org.dromara.out.domain.bo.OutConstructionValueRangeBo;
 import org.dromara.out.domain.vo.OutConstructionAllValueRangeVo;
-import org.dromara.out.domain.vo.OutConstructionValueRangeVo;
-import org.dromara.out.domain.vo.OutConstructionValueVo;
+import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo;
+import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeVo;
 import org.dromara.out.service.IOutConstructionValueRangeService;
 import org.dromara.out.service.IOutConstructionValueService;
 import org.springframework.beans.BeanUtils;
@@ -114,6 +114,16 @@ public class OutConstructionValueRangeController extends BaseController {
         }
     }
 
+    /**
+     * 导出施工产值范围列表
+     */
+    @SaCheckPermission("out:constructionValueRange:export")
+    @Log(title = "施工产值范围", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportByProject")
+    public void exportByProject(OutConstructionValueRangeBo bo, HttpServletResponse response) {
+        outConstructionValueRangeService.exportExcel(bo, response);
+    }
+
     /**
      * 获取施工产值范围详细信息
      *

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueCategoryVo.java

@@ -0,0 +1,119 @@
+package org.dromara.out.domain.vo.outconstructionvalue;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 15:46
+ */
+@Data
+public class OutConstructionValueCategoryVo {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 范围ID
+     */
+    private Long rangeId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 方阵id
+     */
+    private Long matrixId;
+
+    /**
+     * 分项工程id
+     */
+    private Long progressCategoryId;
+
+    /**
+     * 分项工程名称
+     */
+    private String progressCategoryName;
+
+    /**
+     * 计划详情id
+     */
+    private Long detailId;
+
+    /**
+     * 人工填报数量
+     */
+    private Integer artificialNum;
+
+    /**
+     * 无人机识别数量
+     */
+    private Integer uavNum;
+
+    /**
+     * 确认数量
+     */
+    private Integer confirmNum;
+
+    /**
+     * 计划数量
+     */
+    private Integer planNum;
+
+    /**
+     * 対乙产值
+     */
+    private BigDecimal outValue;
+
+    /**
+     * 上报日期
+     */
+    private LocalDate reportDate;
+
+    /**
+     * 计划日期
+     */
+    private LocalDate planDate;
+
+    /**
+     * 对甲产值
+     */
+    private BigDecimal ownerValue;
+
+    /**
+     * 方阵名称
+     */
+    private String matrixName;
+
+    /**
+     * 类别名称
+     */
+    private String name;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    private String unitType;
+
+    /**
+     * 计量单位
+     */
+    private String unit;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 关联结构(1子项目 2方阵 3项目)
+     */
+    private String relevancyStructure;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueMatrixVo.java

@@ -0,0 +1,71 @@
+package org.dromara.out.domain.vo.outconstructionvalue;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 10:09
+ */
+@Data
+public class OutConstructionValueMatrixVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 子项目名
+     */
+    @ExcelProperty(value = "子项")
+    private String subProjectName;
+
+    /**
+     * 方阵名称
+     */
+    @ExcelProperty(value = "方阵")
+    private String matrixName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueProjectVo.java

@@ -0,0 +1,59 @@
+package org.dromara.out.domain.vo.outconstructionvalue;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 10:08
+ */
+@Data
+public class OutConstructionValueProjectVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueSubProjectVo.java

@@ -0,0 +1,65 @@
+package org.dromara.out.domain.vo.outconstructionvalue;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 10:08
+ */
+@Data
+public class OutConstructionValueSubProjectVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 子项目名
+     */
+    @ExcelProperty(value = "子项")
+    private String subProjectName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueVo.java

@@ -1,4 +1,4 @@
-package org.dromara.out.domain.vo;
+package org.dromara.out.domain.vo.outconstructionvalue;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeMatrixVo.java

@@ -0,0 +1,71 @@
+package org.dromara.out.domain.vo.outconstructionvaluerange;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 11:31
+ */
+@Data
+public class OutConstructionValueRangeMatrixVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 子项目名
+     */
+    @ExcelProperty(value = "子项")
+    private String subProjectName;
+
+    /**
+     * 方阵名称
+     */
+    @ExcelProperty(value = "方阵")
+    private String matrixName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeProjectVo.java

@@ -0,0 +1,59 @@
+package org.dromara.out.domain.vo.outconstructionvaluerange;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 11:30
+ */
+@Data
+public class OutConstructionValueRangeProjectVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeSubProjectVo.java

@@ -0,0 +1,65 @@
+package org.dromara.out.domain.vo.outconstructionvaluerange;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-12-01 11:30
+ */
+@Data
+public class OutConstructionValueRangeSubProjectVo {
+
+    /**
+     * 项目名
+     */
+    @ExcelProperty(value = "项目")
+    private String projectName;
+
+    /**
+     * 子项目名
+     */
+    @ExcelProperty(value = "子项")
+    private String subProjectName;
+
+    /**
+     * 分项工程名称
+     */
+    @ExcelProperty(value = "分部分项")
+    private String progressCategoryName;
+
+    /**
+     * 计量方式（0无 1数量 2百分比）
+     */
+    @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比")
+    private String unitType;
+
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private BigDecimal number;
+
+    /**
+     * 对甲产值
+     */
+    @ExcelProperty(value = "金额（对甲）")
+    private BigDecimal ownerValue;
+
+    /**
+     * 产值
+     */
+    @ExcelProperty(value = "金额（对乙）")
+    private BigDecimal outValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java

@@ -1,4 +1,4 @@
-package org.dromara.out.domain.vo;
+package org.dromara.out.domain.vo.outconstructionvaluerange;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -7,6 +7,7 @@ import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.out.domain.OutConstructionValueRange;
+import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo;
 
 import java.io.Serial;
 import java.io.Serializable;