From 4f3e2ca59d350fdc40fe3c93e80d0e683f40cfd8 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 1 Jul 2025 08:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 - ruoyi-admin/pom.xml | 6 +- .../src/main/resources/application-dev.yml | 62 ++++---- .../src/main/resources/application.yml | 10 +- ruoyi-modules/guoyan-platform/pom.xml | 113 -------------- .../platform/controller/TestController.java | 70 --------- .../controller/WorkOrderInfoController.java | 105 ------------- .../platform/domain/ProjectManager.java | 45 ------ .../platform/domain/WorkOrderInfo.java | 124 --------------- .../platform/domain/bo/WorkOrderInfoBo.java | 137 ---------------- .../platform/domain/vo/WorkOrderInfoVo.java | 147 ------------------ .../listener/ProjectManagerListener.java | 63 -------- .../platform/mapper/ProjectManagerMapper.java | 36 ----- .../platform/mapper/WorkOrderInfoMapper.java | 15 -- .../service/IWorkOrderInfoService.java | 68 -------- .../service/ProjectManagerService.java | 28 ---- .../impl/ProjectManagerServiceImpl.java | 38 ----- .../impl/WorkOrderInfoServiceImpl.java | 145 ----------------- .../mapper/platform/ProjectManagerMapper.xml | 11 -- ruoyi-modules/pom.xml | 1 - 20 files changed, 37 insertions(+), 1192 deletions(-) delete mode 100644 ruoyi-modules/guoyan-platform/pom.xml delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java delete mode 100644 ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml diff --git a/pom.xml b/pom.xml index 5f6ab86..ffaf875 100644 --- a/pom.xml +++ b/pom.xml @@ -346,11 +346,6 @@ ${revision} - - org.dromara - guoyan-platform - ${revision} - diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 89ab0e7..af45e01 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -86,11 +86,7 @@ org.dromara ruoyi-demo - - - org.dromara - guoyan-platform - + diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 4410ab5..c247d43 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://localhost:9090/admin instance: service-host-type: IP @@ -13,7 +13,7 @@ spring.boot.admin.client: --- # snail-job 配置 snail-job: - enabled: true + enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 group: "ruoyi_group" # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 @@ -47,35 +47,35 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3306/air_quality?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: root + password: 1234 # 从库数据源 - slave: - lazy: true - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: - password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root + # slave: + # lazy: true + # type: ${spring.datasource.type} + # driverClassName: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + # username: + # password: + # oracle: + # type: ${spring.datasource.type} + # driverClassName: oracle.jdbc.OracleDriver + # url: jdbc:oracle:thin:@//localhost:1521/XE + # username: ROOT + # password: root + # postgres: + # type: ${spring.datasource.type} + # driverClassName: org.postgresql.Driver + # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + # username: root + # password: root + # sqlserver: + # type: ${spring.datasource.type} + # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true + # username: SA + # password: root hikari: # 最大连接池数量 maxPoolSize: 20 @@ -100,9 +100,9 @@ spring.data: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 11 # redis 密码必须配置 - password: ruoyi123 + # password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 82d0f1e..9ff3778 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -21,7 +21,7 @@ captcha: # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 + # 服务器的HTTP端口，默认为8080 远程dev:8084 port: 8080 servlet: # 应用的访问路径 @@ -70,7 +70,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: @profiles.active@ + active: dev # 文件上传 servlet: multipart: @@ -185,9 +185,9 @@ springdoc: api-docs: # 是否开启接口文档 enabled: true -# swagger-ui: -# # 持久化认证数据 -# persistAuthorization: true + # swagger-ui: + # # 持久化认证数据 + # persistAuthorization: true info: # 标题 title: '标题：${ruoyi.name}多租户管理系统_接口文档' diff --git a/ruoyi-modules/guoyan-platform/pom.xml b/ruoyi-modules/guoyan-platform/pom.xml deleted file mode 100644 index 9edfbae..0000000 --- a/ruoyi-modules/guoyan-platform/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - ruoyi-modules - org.dromara - 5.2.3 - - 4.0.0 - - guoyan-platform - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-redis - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-translation - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-demo - - - org.dromara - ruoyi-system - - - - - diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java deleted file mode 100644 index 129761c..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/TestController.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.dromara.platform.controller; - -import com.alibaba.excel.EasyExcel; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.platform.domain.ProjectManager; -import org.dromara.platform.listener.ProjectManagerListener; -import org.dromara.platform.service.ProjectManagerService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.net.URLEncoder; -import java.time.LocalDate; - -/** - * @Author gejunhao - * @Date 2025/1/10 14:11 - * @Description: 测试接口 - */ -@RequiredArgsConstructor -@RestController -@Slf4j -@RequestMapping("/test") -public class TestController { - - @GetMapping("/hello") - public void test(HttpServletResponse response) throws IOException { - log.warn("hello word!"); - response.setContentType("text/html;charset=utf8"); - response.getWriter().println("调用接口成功!"); - } - - @Resource - private ProjectManagerService projectManagerService; - @PostMapping("/uploadProjectManager") - public void upload(MultipartFile file, HttpServletResponse response) throws IOException { - long t1 = System.currentTimeMillis(); - - EasyExcel.read(file.getInputStream(), ProjectManager.class, new ProjectManagerListener(projectManagerService)).sheet().doRead(); - - response.setContentType("text/html;charset=utf8"); - long t2 = System.currentTimeMillis(); - response.getWriter().println("导入数据成功!，共用时："+(t2-t1)); - log.info("导入项目负责人数据成功! 共用时:{}ms",(t2-t1)); - } - - - @GetMapping("/downloadProjectManager") - public void download(HttpServletResponse response) throws IOException { - // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setCharacterEncoding("utf-8"); - String flag = "项目负责人信息"; - // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - LocalDate currentDate = LocalDate.now(); - System.out.println("当前日期: " + currentDate); - String fileName = URLEncoder.encode( flag+currentDate, "UTF-8") - .replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), ProjectManager.class) - .sheet("项目联系人信息"+currentDate) - .doWrite(projectManagerService.getData()); - } -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java deleted file mode 100644 index 0bc4dbd..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.platform.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.platform.domain.vo.WorkOrderInfoVo; -import org.dromara.platform.domain.bo.WorkOrderInfoBo; -import org.dromara.platform.service.IWorkOrderInfoService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 工单信息 - * - * @author gejunhao - * @date 2025-01-13 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/platform/workOrder") -public class WorkOrderInfoController extends BaseController { - - private final IWorkOrderInfoService workOrderInfoService; - - /** - * 查询工单信息列表 - */ - @SaCheckPermission("platform:workOrder:list") - @GetMapping("/list") - public TableDataInfo list(WorkOrderInfoBo bo, PageQuery pageQuery) { - return workOrderInfoService.queryPageList(bo, pageQuery); - } - - /** - * 导出工单信息列表 - */ - @SaCheckPermission("platform:workOrder:export") - @Log(title = "工单信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(WorkOrderInfoBo bo, HttpServletResponse response) { - List list = workOrderInfoService.queryList(bo); - ExcelUtil.exportExcel(list, "工单信息", WorkOrderInfoVo.class, response); - } - - /** - * 获取工单信息详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("platform:workOrder:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { - return R.ok(workOrderInfoService.queryById(id)); - } - - /** - * 新增工单信息 - */ - @SaCheckPermission("platform:workOrder:add") - @Log(title = "工单信息", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/add") - public R add(@Validated(AddGroup.class) @RequestBody WorkOrderInfoBo bo) { - return toAjax(workOrderInfoService.insertByBo(bo)); - } - - /** - * 修改工单信息 - */ - @SaCheckPermission("platform:workOrder:edit") - @Log(title = "工单信息", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping("/update") - public R edit(@RequestBody WorkOrderInfoBo bo) { - return toAjax(workOrderInfoService.updateByBo(bo)); - } - - /** - * 删除工单信息 - * - * @param ids 主键串 - */ - @SaCheckPermission("platform:workOrder:remove") - @Log(title = "工单信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { - return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java deleted file mode 100644 index c9abc31..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ProjectManager.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.dromara.platform.domain; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -/** - * - * @author 14212 - * @TableName project_manager - */ -@TableName(value ="project_manager") -@Data -public class ProjectManager implements Serializable { - - @ExcelProperty(value = "序号") - //@TableId(type = IdType.AUTO) - @TableField(exist = false) - private Integer id; - - - @ExcelProperty(value = "项目名称") - private String projectName; - - /** - * 可以有多个项目负责人 - */ - @ExcelProperty(value = "项目负责人") - private String manager; - - @ExcelProperty(value = "联系方式") - private String phone; - - @ExcelIgnore - private String tenantId; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java deleted file mode 100644 index e6c7a09..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.dromara.platform.domain; - -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; - -import java.io.Serial; - -/** - * 工单信息对象 work_order_info - * - * @author gejunhao - * @date 2025-01-13 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("work_order_info") -public class WorkOrderInfo extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 工单ID - */ - @TableId(value = "id") - private String id; - - /** - * 所属项目 - */ - private String projectName; - - /** - * 报修人员 - */ - private String repairer; - - /** - * 保修人员ID - */ - private Long repairerId; - - /** - * 是否事故 (0: 否, 1: 是) - */ - private Long isAccident; - - /** - * 响应级别 (0: 常规, 1: 紧急, 2: 特急) - */ - private String responseLevel; - - /** - * 响应时限 - */ - private Long responseTime; - - /** - * 故障大类 - */ - private String faultCategory; - - /** - * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) - */ - private String faultSubcategory; - - /** - * 所属机构 - */ - private String institution; - - /** - * 故障地点 - */ - private String faultLocation; - - /** - * 故障描述 - */ - private String faultDescription; - - /** - * 故障图片 - */ - private String faultImage; - - /** - * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) - */ - private String maintenanceRequirement; - - /** - * 派遣意见 - */ - private String dispatchOpinion; - - /** - * 是否派遣 (0: 否, 1: 是) - */ - private Long isDispatched; - - /** - * 纬度 - */ - private String latitude; - - /** - * 经度 - */ - private String longitude; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - - -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java deleted file mode 100644 index 103a30d..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkOrderInfoBo.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.dromara.platform.domain.bo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import org.dromara.platform.domain.WorkOrderInfo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; - -/** - * 工单信息业务对象 work_order_info - * - * @author gejunhao - * @date 2025-01-13 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = WorkOrderInfo.class, reverseConvertGenerate = false) -public class WorkOrderInfoBo extends BaseEntity { - - /** - * 工单ID - */ - //@NotBlank(message = "工单ID不能为空", groups = { EditGroup.class }) - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** - * 所属项目 - */ - @NotBlank(message = "所属项目不能为空", groups = { AddGroup.class, EditGroup.class }) - private String projectName; - - /** - * 报修人员 - */ - @NotBlank(message = "报修人员不能为空", groups = { AddGroup.class, EditGroup.class }) - private String repairer; - - /** - * 保修人员ID - */ - @NotNull(message = "保修人员ID不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long repairerId; - - /** - * 是否事故 (0: 否, 1: 是) - */ - @NotNull(message = "是否事故 (0: 否, 1: 是)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long isAccident; - - /** - * 响应级别 (0: 常规, 1: 紧急, 2: 特急) - */ - @NotBlank(message = "响应级别 (0: 常规, 1: 紧急, 2: 特急)不能为空", groups = { AddGroup.class, EditGroup.class }) - private String responseLevel; - - /** - * 响应时限 - */ - @NotNull(message = "响应时限不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long responseTime; - - /** - * 故障大类 - */ - @NotBlank(message = "故障大类不能为空", groups = { AddGroup.class, EditGroup.class }) - private String faultCategory; - - /** - * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) - */ - @NotBlank(message = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)不能为空", groups = { AddGroup.class, EditGroup.class }) - private String faultSubcategory; - - /** - * 所属机构 - */ - @NotBlank(message = "所属机构不能为空", groups = { AddGroup.class, EditGroup.class }) - private String institution; - - /** - * 故障地点 - */ - @NotBlank(message = "故障地点不能为空", groups = { AddGroup.class, EditGroup.class }) - private String faultLocation; - - /** - * 故障描述 - */ - @NotBlank(message = "故障描述不能为空", groups = { AddGroup.class, EditGroup.class }) - private String faultDescription; - - /** - * 故障图片 - */ - @NotBlank(message = "故障图片不能为空", groups = { AddGroup.class, EditGroup.class }) - private String faultImage; - - /** - * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) - */ - @NotBlank(message = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)不能为空", groups = { AddGroup.class, EditGroup.class }) - private String maintenanceRequirement; - - /** - * 派遣意见 - */ - @NotBlank(message = "派遣意见不能为空", groups = { AddGroup.class, EditGroup.class }) - private String dispatchOpinion; - - /** - * 是否派遣 (0: 否, 1: 是) - */ - @NotNull(message = "是否派遣 (0: 否, 1: 是)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long isDispatched; - - /** - * 纬度 - */ - @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class }) - private String latitude; - - /** - * 经度 - */ - @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class }) - private String longitude; - - -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java deleted file mode 100644 index 5cfb883..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.dromara.platform.domain.vo; - -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.platform.domain.WorkOrderInfo; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - - -/** - * 工单信息视图对象 work_order_info - * - * @author gejunhao - * @date 2025-01-13 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = WorkOrderInfo.class) -public class WorkOrderInfoVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 工单ID - */ - @ExcelProperty(value = "工单ID") - private String id; - - /** - * 所属项目 - */ - @ExcelProperty(value = "所属项目") - private String projectName; - - /** - * 报修人员 - */ - @ExcelProperty(value = "报修人员") - private String repairer; - - /** - * 保修人员ID - */ - @ExcelProperty(value = "保修人员ID") - private Long repairerId; - - /** - * 是否事故 (0: 否, 1: 是) - */ - @ExcelProperty(value = "是否事故 (0: 否, 1: 是)") - private Long isAccident; - - /** - * 响应级别 (0: 常规, 1: 紧急, 2: 特急) - */ - @ExcelProperty(value = "响应级别 (0: 常规, 1: 紧急, 2: 特急)") - private String responseLevel; - - /** - * 响应时限 - */ - @ExcelProperty(value = "响应时限") - private Long responseTime; - - /** - * 故障大类 - */ - @ExcelProperty(value = "故障大类") - private String faultCategory; - - /** - * 故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊) - */ - @ExcelProperty(value = "故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)") - private String faultSubcategory; - - /** - * 所属机构 - */ - @ExcelProperty(value = "所属机构") - private String institution; - - /** - * 故障地点 - */ - @ExcelProperty(value = "故障地点") - private String faultLocation; - - /** - * 故障描述 - */ - @ExcelProperty(value = "故障描述") - private String faultDescription; - - /** - * 故障图片 - */ - @ExcelProperty(value = "故障图片") - private String faultImage; - - /** - * 故障图片Url - */ - @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "faultImage") - private String faultImageUrl; - /** - * 维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他) - */ - @ExcelProperty(value = "维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)") - private String maintenanceRequirement; - - /** - * 派遣意见 - */ - @ExcelProperty(value = "派遣意见") - private String dispatchOpinion; - - /** - * 是否派遣 (0: 否, 1: 是) - */ - @ExcelProperty(value = "是否派遣 (0: 否, 1: 是)") - private Long isDispatched; - - /** - * 纬度 - */ - @ExcelProperty(value = "纬度") - private String latitude; - - /** - * 经度 - */ - @ExcelProperty(value = "经度") - private String longitude; - - -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java deleted file mode 100644 index f2452a7..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/ProjectManagerListener.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.dromara.platform.listener; - -import com.alibaba.excel.context.AnalysisContext; - - -import com.alibaba.excel.read.listener.ReadListener; -import lombok.extern.slf4j.Slf4j; -import org.dromara.platform.domain.ProjectManager; -import org.dromara.platform.service.ProjectManagerService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; - -/** - * 自定义监听器读数据 - * @author gjh - */ -@Slf4j -public class ProjectManagerListener implements ReadListener { - - private List list = new ArrayList<>(); - /** - * 自己定义一个缓冲量 - */ - private static final int BATCH_COUNT = 20; - @Autowired - private ProjectManagerService projectManagerService; - - public ProjectManagerListener(ProjectManagerService projectManagerService) { - this.projectManagerService = projectManagerService; - } - - /** - * 每读一行数据都会调用这个方法 - * - * @param projectManager - * @param analysisContext - */ - @Override - public void invoke(ProjectManager projectManager, AnalysisContext analysisContext) { - // 读取一行数据就添加到集合 - list.add(projectManager); - // 判断是否到达缓存量了 - if (list.size() >= BATCH_COUNT){ - // 操作数据库 - projectManagerService.addData(list); - list = new ArrayList<>(BATCH_COUNT); - } - } - - /** - * 读完整个excel之后再调用这个方法 - * - * @param analysisContext - */ - @Override - public void doAfterAllAnalysed(AnalysisContext analysisContext) { - if (list.size()>0){ - projectManagerService.addData(list); - } - } -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java deleted file mode 100644 index 3ec4036..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ProjectManagerMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.dromara.platform.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import org.apache.ibatis.annotations.ResultType; -import org.apache.ibatis.annotations.Select; -import org.dromara.platform.domain.ProjectManager; - -import java.util.List; - -/** -* @author 14212 -* @description 针对表【project_manager】的数据库操作Mapper -* @createDate 2025-01-08 09:22:14 -* @Entity com.gejunhao.pojo.ProjectManager -*/ -public interface ProjectManagerMapper extends BaseMapper { - /** - *从数据库中获取数据 - * @return - */ - @Select("select * from project_manager") - @ResultType(ProjectManager.class) - List getDate(); - - /** - * xml写法 - * @return - */ - @ResultType(ProjectManager.class) - List selectAll(); -} - - - - diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java deleted file mode 100644 index a2ead8a..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/WorkOrderInfoMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.platform.mapper; - -import org.dromara.platform.domain.WorkOrderInfo; -import org.dromara.platform.domain.vo.WorkOrderInfoVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 工单信息Mapper接口 - * - * @author gejunhao - * @date 2025-01-10 - */ -public interface WorkOrderInfoMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java deleted file mode 100644 index 64832cb..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.platform.service; - -import org.dromara.platform.domain.vo.WorkOrderInfoVo; -import org.dromara.platform.domain.bo.WorkOrderInfoBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 工单信息Service接口 - * - * @author gejunhao - * @date 2025-01-13 - */ -public interface IWorkOrderInfoService { - - /** - * 查询工单信息 - * - * @param id 主键 - * @return 工单信息 - */ - WorkOrderInfoVo queryById(String id); - - /** - * 分页查询工单信息列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 工单信息分页列表 - */ - TableDataInfo queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的工单信息列表 - * - * @param bo 查询条件 - * @return 工单信息列表 - */ - List queryList(WorkOrderInfoBo bo); - - /** - * 新增工单信息 - * - * @param bo 工单信息 - * @return 是否新增成功 - */ - Boolean insertByBo(WorkOrderInfoBo bo); - - /** - * 修改工单信息 - * - * @param bo 工单信息 - * @return 是否修改成功 - */ - Boolean updateByBo(WorkOrderInfoBo bo); - - /** - * 校验并批量删除工单信息信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java deleted file mode 100644 index 0c628ed..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/ProjectManagerService.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.platform.service; - - - -import com.baomidou.mybatisplus.extension.service.IService; -import org.dromara.platform.domain.ProjectManager; - -import java.util.List; - -/** -* @author 14212 -* @description 针对表【project_manager】的数据库操作Service -* @createDate 2025-01-08 09:22:14 -*/ -public interface ProjectManagerService extends IService { - /** - * 批量插入数据 - * @param list - */ - public void addData(List list); - - - /** - * 从数据库中获取数据 - * @return - */ - public List getData(); -} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java deleted file mode 100644 index fdbc0a3..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectManagerServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.dromara.platform.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.annotation.Resource; -import org.dromara.platform.domain.ProjectManager; -import org.dromara.platform.mapper.ProjectManagerMapper; -import org.dromara.platform.service.ProjectManagerService; -import org.springframework.stereotype.Service; -import java.util.List; - -/** -* @author 14212 -* @description 针对表【project_manager】的数据库操作Service实现 -* @createDate 2025-01-08 09:22:14 - */ -@Service -public class ProjectManagerServiceImpl extends ServiceImpl - implements ProjectManagerService { - @Resource - private ProjectManagerMapper projectManagerMapper; - - @Override - public void addData(List list) { - this.saveBatch(list); - } - - @Override - public List getData() { - List projectManagers = projectManagerMapper.selectAll(); - return projectManagers; - } - -} - - - - diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java deleted file mode 100644 index 315990b..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.dromara.platform.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.dromara.platform.domain.bo.WorkOrderInfoBo; -import org.dromara.platform.domain.vo.WorkOrderInfoVo; -import org.dromara.platform.domain.WorkOrderInfo; -import org.dromara.platform.mapper.WorkOrderInfoMapper; -import org.dromara.platform.service.IWorkOrderInfoService; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * 工单信息Service业务层处理 - * - * @author gejunhao - * @date 2025-01-13 - */ -@RequiredArgsConstructor -@Service -public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { - - private final WorkOrderInfoMapper baseMapper; - - /** - * 查询工单信息 - * - * @param id 主键 - * @return 工单信息 - */ - @Override - public WorkOrderInfoVo queryById(String id){ - return baseMapper.selectVoById(id); - } - - /** - * 分页查询工单信息列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 工单信息分页列表 - */ - @Override - public TableDataInfo queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的工单信息列表 - * - * @param bo 查询条件 - * @return 工单信息列表 - */ - @Override - public List queryList(WorkOrderInfoBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(WorkOrderInfoBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getProjectName()), WorkOrderInfo::getProjectName, bo.getProjectName()); - lqw.eq(StringUtils.isNotBlank(bo.getRepairer()), WorkOrderInfo::getRepairer, bo.getRepairer()); - lqw.eq(bo.getRepairerId() != null, WorkOrderInfo::getRepairerId, bo.getRepairerId()); - lqw.eq(bo.getIsAccident() != null, WorkOrderInfo::getIsAccident, bo.getIsAccident()); - lqw.eq(StringUtils.isNotBlank(bo.getResponseLevel()), WorkOrderInfo::getResponseLevel, bo.getResponseLevel()); - lqw.eq(bo.getResponseTime() != null, WorkOrderInfo::getResponseTime, bo.getResponseTime()); - lqw.eq(StringUtils.isNotBlank(bo.getFaultCategory()), WorkOrderInfo::getFaultCategory, bo.getFaultCategory()); - lqw.eq(StringUtils.isNotBlank(bo.getFaultSubcategory()), WorkOrderInfo::getFaultSubcategory, bo.getFaultSubcategory()); - lqw.eq(StringUtils.isNotBlank(bo.getInstitution()), WorkOrderInfo::getInstitution, bo.getInstitution()); - lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation()); - lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription()); - lqw.eq(StringUtils.isNotBlank(bo.getFaultImage()), WorkOrderInfo::getFaultImage, bo.getFaultImage()); - lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceRequirement()), WorkOrderInfo::getMaintenanceRequirement, bo.getMaintenanceRequirement()); - lqw.eq(StringUtils.isNotBlank(bo.getDispatchOpinion()), WorkOrderInfo::getDispatchOpinion, bo.getDispatchOpinion()); - lqw.eq(bo.getIsDispatched() != null, WorkOrderInfo::getIsDispatched, bo.getIsDispatched()); - lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), WorkOrderInfo::getLatitude, bo.getLatitude()); - lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), WorkOrderInfo::getLongitude, bo.getLongitude()); - return lqw; - } - - /** - * 新增工单信息 - * - * @param bo 工单信息 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(WorkOrderInfoBo bo) { - WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class); - //validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改工单信息 - * - * @param bo 工单信息 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(WorkOrderInfoBo bo) { - WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class); - //validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(WorkOrderInfo entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除工单信息信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml b/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml deleted file mode 100644 index c4d92b1..0000000 --- a/ruoyi-modules/guoyan-platform/src/main/resources/mapper/platform/ProjectManagerMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index b8286ce..daff497 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -15,7 +15,6 @@ ruoyi-job ruoyi-system ruoyi-workflow - guoyan-platform ruoyi-modules