diff --git a/pom.xml b/pom.xml index b7f4ef6..079902e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ urbanops-module-bpm urbanops-module-report + urbanops-module-api diff --git a/urbanops-module-api/pom.xml b/urbanops-module-api/pom.xml new file mode 100644 index 0000000..9012305 --- /dev/null +++ b/urbanops-module-api/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + urbanops + com.zteits.boot + ${revision} + + pom + + urbanops-module-workorder-api + + + urbanops-module-api + + 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分： + 1. core 包：是该组件的核心封装 + 2. config 包：是该组件基于 Spring 的配置 + + 技术组件，也分成两类： + 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展 + 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。 + 如果是业务组件，Maven 名字会包含 biz + + https://github.com/YunaiV/ruoyi-vue-pro + + diff --git a/urbanops-module-api/urbanops-module-garden-api/pom.xml b/urbanops-module-api/urbanops-module-garden-api/pom.xml new file mode 100644 index 0000000..fa639a5 --- /dev/null +++ b/urbanops-module-api/urbanops-module-garden-api/pom.xml @@ -0,0 +1,35 @@ + + + + + urbanops-module-api + com.zteits.boot + ${revision} + + 4.0.0 + urbanops-module-garden-api + jar + + ${project.artifactId} + + bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。 + 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等 + bpm 解释：https://baike.baidu.com/item/BPM/1933 + + 工作流基于 Flowable 6 实现，分成流程定义、流程表单、流程实例、流程任务等功能模块。 + + + + + com.zteits.boot + urbanops-spring-boot-starter-web + + + + com.zteits.boot + urbanops-spring-boot-starter-test + + + diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java index dbe0244..7f5f5bb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java @@ -1,6 +1,7 @@ package com.zteits.urbanops.module.garden.api.material; -import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto; + +import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto; /** * @Classname MaterialApi diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java new file mode 100644 index 0000000..4ba08be --- /dev/null +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java @@ -0,0 +1,14 @@ +package com.zteits.urbanops.module.garden.api.road; + + +import com.zteits.urbanops.module.garden.dto.road.RoadReqDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadRespDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO; + +import java.util.List; + +public interface RoadApi { + List getRoadInfoBy(RoadReqDTO reqDTO); + + RoadStreetRespDTO getRoadInfoById(Long id); +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java index a850a97..53f388e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java @@ -1,4 +1,4 @@ -package com.zteits.urbanops.module.garden.api.material.dto; +package com.zteits.urbanops.module.garden.dto.material; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java index 624993e..e7598d8 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadReqDTO.java @@ -1,4 +1,4 @@ -package com.zteits.urbanops.module.garden.api.road.dto; +package com.zteits.urbanops.module.garden.dto.road; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadRespDTO.java index 8b19b76..ff6daa0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadRespDTO.java @@ -1,4 +1,4 @@ -package com.zteits.urbanops.module.garden.api.road.dto; +package com.zteits.urbanops.module.garden.dto.road; import lombok.Data; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java index 8633552..0a2ed50 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java @@ -1,7 +1,5 @@ -package com.zteits.urbanops.module.garden.api.road.dto; +package com.zteits.urbanops.module.garden.dto.road; -import cn.idev.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** diff --git a/urbanops-module-api/urbanops-module-workorder-api/pom.xml b/urbanops-module-api/urbanops-module-workorder-api/pom.xml new file mode 100644 index 0000000..62e4351 --- /dev/null +++ b/urbanops-module-api/urbanops-module-workorder-api/pom.xml @@ -0,0 +1,39 @@ + + + + + urbanops-module-api + com.zteits.boot + ${revision} + + 4.0.0 + urbanops-module-workorder-api + jar + + ${project.artifactId} + + bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。 + 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等 + bpm 解释：https://baike.baidu.com/item/BPM/1933 + + 工作流基于 Flowable 6 实现，分成流程定义、流程表单、流程实例、流程任务等功能模块。 + + + + + com.zteits.boot + urbanops-spring-boot-starter-web + + + + com.zteits.boot + urbanops-spring-boot-starter-test + + + com.zteits.boot + urbanops-spring-boot-starter-excel + + + diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApi.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java index bbe9c1c..e230773 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApi.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java @@ -1,9 +1,8 @@ -package com.zteits.urbanops.module.workorder.api.workorder; +package com.zteits.urbanops.module.workorder.api; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO; +import com.zteits.urbanops.module.workorder.dto.AdminUserRespVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import java.util.List; @@ -25,7 +24,7 @@ public interface WorkOrderApi { * @param notHas false 不包含loginUserId * @return */ - public List getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas); + public List getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas); /** * 通过道路 roadId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选 @@ -34,7 +33,7 @@ public interface WorkOrderApi { * @param busiLine * @return */ - public List getUserByRoadIdAndRoleCode(Long roadId,String roleCode,String busiLine); + public List getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine); /** * 创建工单API diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AdminUserRespVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AdminUserRespVO.java new file mode 100644 index 0000000..02f93c0 --- /dev/null +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AdminUserRespVO.java @@ -0,0 +1,48 @@ +package com.zteits.urbanops.module.workorder.dto; + +import com.zteits.urbanops.framework.common.enums.CommonStatusEnum; +import lombok.Data; + +import java.util.Set; + +/** + * Admin 用户 Response DTO + * + * @author ZIEITS + */ +@Data +public class AdminUserRespVO { + + /** + * 用户ID + */ + private Long id; + /** + * 用户昵称 + */ + private String nickname; + /** + * 帐号状态 + * + * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + + /** + * 部门ID + */ + private Long deptId; + /** + * 岗位编号数组 + */ + private Set postIds; + /** + * 手机号码 + */ + private String mobile; + /** + * 用户头像 + */ + private String avatar; + +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java index 1284abd..258e86e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java @@ -1,4 +1,4 @@ -package com.zteits.urbanops.module.workorder.controller.app.garden.vo; +package com.zteits.urbanops.module.workorder.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; @@ -9,7 +9,6 @@ import org.hibernate.validator.constraints.Length; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import java.util.Map; /** * @author yanhuiqing @@ -93,3 +92,4 @@ public class AppGardenWorkOrderReqVO { } + diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderRespVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderRespVO.java index 9fdb24d..8cda872 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderRespVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderRespVO.java @@ -1,6 +1,5 @@ -package com.zteits.urbanops.module.workorder.controller.app.garden.vo; +package com.zteits.urbanops.module.workorder.dto; -import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java index f418cc8..92a23fa 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java @@ -1,14 +1,14 @@ -package com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo; +package com.zteits.urbanops.module.workorder.dto; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.math.BigDecimal; +import lombok.Data; -import org.hibernate.validator.constraints.Length; -import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; +import java.util.List; +import java.util.Set; @Schema(description = "管理后台 - 工单信息 Response VO") @Data diff --git a/urbanops-module-garden/pom.xml b/urbanops-module-garden/pom.xml index 7393e28..c3eaf1b 100644 --- a/urbanops-module-garden/pom.xml +++ b/urbanops-module-garden/pom.xml @@ -129,7 +129,19 @@ com.zteits.boot urbanops-module-bpm - 2025.10-SNAPSHOT + ${revision} + compile + + + com.zteits.boot + urbanops-module-workorder-api + ${revision} + compile + + + com.zteits.boot + urbanops-module-garden-api + ${revision} compile diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java index 0de1671..5c7ac9e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java @@ -1,8 +1,8 @@ package com.zteits.urbanops.module.garden.api.material; import cn.hutool.core.bean.BeanUtil; -import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto; import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO; +import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto; import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import org.springframework.validation.annotation.Validated; */ @Service @Validated -public class MaterialApiImpl implements MaterialApi{ +public class MaterialApiImpl implements MaterialApi { @Resource private MaterialInventoryOutService materialInventoryOutService; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java deleted file mode 100644 index fce06e3..0000000 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zteits.urbanops.module.garden.api.road; - -import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; -import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; -import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO; - -import java.util.List; - -/** - * @author yanhuiqing - * @version 1.0 - * @description: 道路api 通过经纬度 系统编码获取道路信息 - * @date 2025/12/9 22:12 - */ -public interface RoadApi { - public List getRoadInfoBy(RoadReqDTO reqDTO); - - public RoadStreetRespDTO getRoadInfoById(Long id); -} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java index 43b824e..4308011 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java @@ -5,10 +5,10 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.zteits.urbanops.framework.common.util.http.HttpUtils; import com.zteits.urbanops.framework.common.util.object.BeanUtils; -import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; -import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; -import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO; import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadRespVO; +import com.zteits.urbanops.module.garden.dto.road.RoadReqDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadRespDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO; import com.zteits.urbanops.module.garden.service.road.RoadService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -29,7 +29,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class RoadApiImpl implements RoadApi{ +public class RoadApiImpl implements RoadApi { @Value("${siot.roadUrl}") private String roadInfoUrl; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java index 33d730f..1807736 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java @@ -40,13 +40,6 @@ public class MaintainPlanCommitDetailRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "总完成百分比", example = "98.00") - private Integer totalFinishNum; - - @Schema(description = "本次完成百分比", example = "98.00") - @ExcelProperty("本次完成百分比") - private Integer finishPercent; - @Schema(description = "照片host", example = "aaa") @ExcelProperty("照片host") private String imgHost; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java index 564d07c..5f85b22 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java @@ -67,10 +67,6 @@ public class MaintainPlanCommitRespVO { @ExcelProperty("养护类型") private Integer planTypeId; - @Schema(description = "本次完成百分比") - @ExcelProperty("本次完成百分比") - private Integer finishPercent; - @Schema(description = "完成次数") @ExcelProperty("完成次数") private Integer planFinishNum; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java index 0f17f84..02c871b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java @@ -42,9 +42,6 @@ public class AppMaintainPlanCommitDetailPageRespVO { private String imgHost; @Schema(description = "开始照片") - private String beginImg; - - @Schema(description = "开始照片") private List beginImgList; /** @@ -56,9 +53,6 @@ public class AppMaintainPlanCommitDetailPageRespVO { */ private Double opTime; - @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) - private Integer finishPercent; - @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) private Integer finishState; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java index b3cd401..74874d7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java @@ -16,10 +16,6 @@ public class AppMaintainPlanCommitSaveReqVO { @NotEmpty(message = "计划编码不能为空") private String planNo; - @Schema(description = "本次总完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "本次总完成百分比不能为空") - private Integer totalFinishPercent; - @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "照片host不能为空") private String imgHost; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java new file mode 100644 index 0000000..7bf0c6a --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java @@ -0,0 +1,35 @@ +package com.zteits.urbanops.module.garden.convert; + +import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitSaveReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import org.mapstruct.factory.Mappers; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +public interface AppGardenWorkOrderConvert { + + AppGardenWorkOrderConvert INSTANCE = Mappers.getMapper(AppGardenWorkOrderConvert.class); + + default AppGardenWorkOrderReqVO buildAppGardenWorkOrderReqVO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO, RoadDO roadDO, String planNo ) { + AppGardenWorkOrderReqVO orderReqVO = new AppGardenWorkOrderReqVO(); + orderReqVO.setRoadId(inspectionPlanDO.getRoadId()); + orderReqVO.setRoadName(inspectionPlanDO.getRoadName()); + orderReqVO.setImgs(createReqVO.getImgList()); + orderReqVO.setRemark(createReqVO.getRemark()); + orderReqVO.setPressingType(2);//紧急 + orderReqVO.setOrderName(inspectionPlanDO.getPlanName()); + orderReqVO.setSourceId(1);//来源ID 工单来源 1、巡查 + orderReqVO.setSourceName("园林巡查上报"); + orderReqVO.setThirdWorkNo(planNo); + orderReqVO.setFinishDate(LocalDateTime.now()); + orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine()); + orderReqVO.setLatLonType(3); + orderReqVO.setLat(new BigDecimal(roadDO.getStartingLatitude())); + orderReqVO.setLon(new BigDecimal(roadDO.getStartingLongitude())); + orderReqVO.setLonLatAddress(roadDO.getStartingRemark()); + return orderReqVO; + } +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java index 808497b..e92b841 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java @@ -59,10 +59,6 @@ public class MaintainPlanCommitDO extends BaseDO { */ private Long roadId; /** - * 本次完成百分比 - */ - private Integer finishPercent; - /** * 照片host */ private String imgHost; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java index 8082687..000c25c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java @@ -36,10 +36,4 @@ public interface MaintainPlanCommitMapper extends BaseMapperX appMaintainPlanCommitDetailPage(@Param("page") IPage page, @Param("req") AppMaintainPlanCommitPageReqVO pageReqVO); - /** - * 获取所有已完成比例 - * - * @return - */ - int selectFinishPercent(@Param("planNo") String planNo, @Param("sortNum") Integer sortNum); } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java index 48f1671..309c7d6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java @@ -14,16 +14,22 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitSaveReqVO; import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO; import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitSaveReqVO; +import com.zteits.urbanops.module.garden.convert.AppGardenWorkOrderConvert; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanCommitMapper; import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper; import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper; +import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper; import com.zteits.urbanops.module.system.api.dept.DeptApi; import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import com.zteits.urbanops.module.system.api.permission.RoleApi; +import com.zteits.urbanops.module.workorder.api.WorkOrderApi; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +51,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.INSPECT */ @Service @Validated +@Slf4j public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitService { @Resource @@ -57,10 +64,13 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ private InspectionPlanDetailMapper inspectionPlanDetailMapper; @Resource + private RoadMapper roadMapper; + + @Resource private DeptApi deptApi; @Resource - private RoleApi roleApi; + private WorkOrderApi workOrderApi; @Override public Long createInspectionPlanCommit(InspectionPlanCommitSaveReqVO createReqVO) { @@ -86,15 +96,17 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ if(null == inspectionPlanDO){ throw exception(INSPECTION_PLAN_NOT_EXISTS); } + /*3.转工单*/ + String taskId = addWorkOrder(createReqVO, inspectionPlanDO); InspectionPlanCommitDO inspectionPlanCommit = getInspectionPlanCommitDO(createReqVO, inspectionPlanDO); - - /*3.查询计划明细最大次数*/ + inspectionPlanCommit.setTransWorkNo(taskId); + /*4.查询计划明细最大次数*/ Long countNum = inspectionPlanCommitMapper.selectCount(new QueryWrapper().lambda() .eq(InspectionPlanCommitDO::getPlanNo, createReqVO.getPlanNo())); inspectionPlanCommit.setSortNum(countNum.intValue() + 1); - /*4.插入明细*/ + /*5.插入明细*/ inspectionPlanCommitMapper.insert(inspectionPlanCommit); Integer detailFinishNum = inspectionPlanDetailDO.getPlanFinishNum() + 1; @@ -124,6 +136,24 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ return 1L; } + /** + * 转工单 + * @param createReqVO + * @param inspectionPlanDO + * @return + */ + private String addWorkOrder(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO) { + //转交状态: 1:未转交;2:已转交 + if (createReqVO.getTransState().equals(1)) { + return null; + } + //查询道路信息 + RoadDO roadDO = roadMapper.selectOne(RoadDO::getId, inspectionPlanDO.getRoadId()); + AppGardenWorkOrderRespVO workOrder = workOrderApi.createWorkOrder(AppGardenWorkOrderConvert.INSTANCE.buildAppGardenWorkOrderReqVO(createReqVO, inspectionPlanDO, roadDO, createReqVO.getPlanNo())); + log.info("创建工单结果:{}", JSONObject.toJSONString(workOrder)); + return workOrder.getTaskId(); + } + private static InspectionPlanCommitDO getInspectionPlanCommitDO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO) { LocalDateTime now = LocalDateTime.now(); Long userId = SecurityFrameworkUtils.getLoginUserId(); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java index 09d4ed0..f968a04 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java @@ -94,9 +94,8 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService throw exception(MAINTAIN_PLAN_NOT_EXISTS); } + //排序号 int sortNum = maintainPlanDetailDO.getPlanFinishNum() +1; - /*3.查询已完成比例*/ -// int finishPercent = maintainPlanCommitMapper.selectFinishPercent(createReqVO.getPlanNo(), sortNum); MaintainPlanCommitDO commitDO = new MaintainPlanCommitDO(); commitDO.setBatchNo(maintainPlanDO.getBatchNo()); @@ -108,7 +107,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService commitDO.setCompanyId(maintainPlanDO.getCompanyId()); commitDO.setDeptId(maintainPlanDO.getDeptId()); commitDO.setRoadId(maintainPlanDO.getRoadId()); - commitDO.setFinishPercent(createReqVO.getTotalFinishPercent()); commitDO.setImgHost(createReqVO.getImgHost()); commitDO.setBeginImg(JSONObject.toJSONString(createReqVO.getBeginImg())); commitDO.setProcessImg("[]"); @@ -145,40 +143,34 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService } - int detailFinishNum = maintainPlanDetailDO.getPlanFinishNum(); - if(createReqVO.getTotalFinishPercent().equals(100)){ - detailFinishNum = detailFinishNum + 1; - } - + int detailFinishNum = maintainPlanDetailDO.getPlanFinishNum() + 1; //完成状态 1:未完成;2:已完成 int detailFinishState = FinishStateEnum.NOT_FINISHED.getStatus(); if(detailFinishNum == maintainPlanDetailDO.getPlanNum()){ detailFinishState = FinishStateEnum.FINISHED.getStatus(); } - //完成状态 1:未完成;2:已完成 - if(detailFinishState == FinishStateEnum.FINISHED.getStatus()){ - //更新明细 - LambdaUpdateWrapper detailUpdateSql = new LambdaUpdateWrapper() - .set(MaintainPlanDetailDO::getPlanFinishNum, detailFinishNum) - .set(MaintainPlanDetailDO::getFinishState, detailFinishState) - .set(MaintainPlanDetailDO::getUpdateTime, LocalDateTime.now()) - .eq(MaintainPlanDetailDO::getPlanNo, createReqVO.getPlanNo()); - maintainPlanDetailMapper.update(detailUpdateSql); - - int finishState = FinishStateEnum.NOT_FINISHED.getStatus(); - if(maintainPlanDO.getPlanNum().equals(maintainPlanDO.getPlanFinishNum()+1)){ - finishState = FinishStateEnum.FINISHED.getStatus(); - } - LambdaUpdateWrapper maintainPlanDOSql = new LambdaUpdateWrapper() - .set(MaintainPlanDO::getPlanFinishNum, maintainPlanDO.getPlanFinishNum()+1) - .set(MaintainPlanDO::getFinishState, finishState) - .set(MaintainPlanDO::getUpdateTime, LocalDateTime.now()) - .eq(MaintainPlanDO::getBatchNo, maintainPlanDO.getBatchNo()); - //更新计划汇总 - maintainPlanMapper.update(maintainPlanDOSql); - } + //更新明细 + LambdaUpdateWrapper detailUpdateSql = new LambdaUpdateWrapper() + .set(MaintainPlanDetailDO::getPlanFinishNum, detailFinishNum) + .set(MaintainPlanDetailDO::getFinishState, detailFinishState) + .set(MaintainPlanDetailDO::getUpdateTime, LocalDateTime.now()) + .eq(MaintainPlanDetailDO::getPlanNo, createReqVO.getPlanNo()); + maintainPlanDetailMapper.update(detailUpdateSql); + + Integer planFinishNum = maintainPlanDO.getPlanFinishNum()+1; + int finishState = FinishStateEnum.NOT_FINISHED.getStatus(); + if(maintainPlanDO.getPlanNum().equals(planFinishNum)){ + finishState = FinishStateEnum.FINISHED.getStatus(); + } + LambdaUpdateWrapper maintainPlanDOSql = new LambdaUpdateWrapper() + .set(MaintainPlanDO::getPlanFinishNum, planFinishNum) + .set(MaintainPlanDO::getFinishState, finishState) + .set(MaintainPlanDO::getUpdateTime, LocalDateTime.now()) + .eq(MaintainPlanDO::getBatchNo, maintainPlanDO.getBatchNo()); + //更新计划汇总 + maintainPlanMapper.update(maintainPlanDOSql); return commitDO.getId(); } @@ -222,11 +214,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService //分页 IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanCommitMapper.appMaintainPlanCommitDetailPage(mpPage, pageReqVO); - - page.getRecords().forEach(respVO -> { - respVO.setBeginImgList(StrUtils.imgProcess(respVO.getBeginImg(), "")); - }); - // 转换返回 return new PageResult<>(page.getRecords(), page.getTotal()); } @@ -250,7 +237,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), "")); respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), "")); respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), "")); - respVO.setTotalFinishNum(maintainPlanDetailDO.getPlanFinishNum()); List commonUsers = new ArrayList<>(); List maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper().lambda() .eq(MaintainPlanCommonUserDO::getParentId, maintainPlanDetailDO.getId()) diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml index 0992fb8..84b6326 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -9,6 +9,10 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + + + - - diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml index 1753052..d7081f4 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -23,7 +23,6 @@ a.cycle_id, c.plan_num, c.plan_finish_num, - c.finish_state, c.begin_time, c.end_time, diff --git a/urbanops-module-workorder/pom.xml b/urbanops-module-workorder/pom.xml index a713790..dc4851b 100644 --- a/urbanops-module-workorder/pom.xml +++ b/urbanops-module-workorder/pom.xml @@ -133,7 +133,13 @@ com.zteits.boot - urbanops-module-garden + urbanops-module-garden-api + ${revision} + compile + + + com.zteits.boot + urbanops-module-workorder-api ${revision} compile diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java index 477f941..ba0f1f2 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java @@ -1,13 +1,14 @@ package com.zteits.urbanops.module.workorder.api.workorder; -import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; +import com.zteits.urbanops.module.workorder.api.WorkOrderApi; import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO; import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper; +import com.zteits.urbanops.module.workorder.dto.AdminUserRespVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -28,7 +29,7 @@ import static com.zteits.urbanops.framework.common.exception.util.ServiceExcepti * @date 2025/12/5 17:21 */ @Service -public class WorkOrderApiImpl implements WorkOrderApi{ +public class WorkOrderApiImpl implements WorkOrderApi { @Resource private MainInfoExtMapper workOrderExtMapper; @@ -57,19 +58,21 @@ public class WorkOrderApiImpl implements WorkOrderApi{ } @Override - public List getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas) { + public List getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas) { if(ObjectUtils.isEmpty(loginUserId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){ throw exception0(BAD_REQUEST.getCode(),"param:loginUserId,roleCode,busiLine 不能为空！"); } - return workOrderExtMapper.getUserByLoginIdAndRoleCode(loginUserId,roleCode,busiLine,notHas); + List list = workOrderExtMapper.getUserByLoginIdAndRoleCode(loginUserId, roleCode, busiLine, notHas); + return BeanUtils.toBean(list, AdminUserRespVO.class); } @Override - public List getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) { + public List getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) { if(ObjectUtils.isEmpty(roadId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){ throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！"); } - return workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine); + List list = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId, roleCode, busiLine); + return BeanUtils.toBean(list, AdminUserRespVO.class); } @Override diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java index 59a951e..fc21110 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java @@ -11,11 +11,11 @@ import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO; import com.zteits.urbanops.module.system.service.dept.DeptService; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO; -import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoSaveReqVO; import com.zteits.urbanops.module.workorder.convert.maininfo.MainInfoConvert; import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; +import com.zteits.urbanops.module.workorder.dto.MainInfoRespVO; import com.zteits.urbanops.module.workorder.service.attachment.AttachmentService; import com.zteits.urbanops.module.workorder.service.maininfo.MainInfoService; import io.swagger.v3.oas.annotations.Operation; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java index 206d341..942e535 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java @@ -1,22 +1,13 @@ package com.zteits.urbanops.module.workorder.controller.app.garden; -import cn.hutool.core.util.StrUtil; import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.util.json.JsonUtils; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; -import com.zteits.urbanops.framework.web.core.util.WebFrameworkUtils; -import com.zteits.urbanops.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailReqVO; -import com.zteits.urbanops.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO; -import com.zteits.urbanops.module.bpm.controller.admin.task.vo.task.BpmTaskDelegateReqVO; -import com.zteits.urbanops.module.bpm.controller.admin.task.vo.task.BpmTaskTransferReqVO; import com.zteits.urbanops.module.garden.api.road.RoadApi; -import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; -import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadReqDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadRespDTO; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; -import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.*; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.common.UserInfoPageReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskReturnExtReqVO; @@ -26,17 +17,17 @@ import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.App import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.AppGardenApprovalDetailRespVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.*; import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/AppGardenTaskConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/AppGardenTaskConvert.java index b943b96..3a7cb2f 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/AppGardenTaskConvert.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/AppGardenTaskConvert.java @@ -13,11 +13,11 @@ import com.zteits.urbanops.module.bpm.framework.flowable.core.util.FlowableUtils import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRespVO; import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoExtDO; import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMapper; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java index fc36fdb..1587814 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java @@ -4,9 +4,9 @@ import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; -import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO; import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; +import com.zteits.urbanops.module.workorder.dto.MainInfoRespVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java index 2f4c95b..dc1444f 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java @@ -3,9 +3,8 @@ package com.zteits.urbanops.module.workorder.service.garden; import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; -import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderCreateReqVO; import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.*; +import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderPageReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskReturnExtReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskTeamLeaderAssignReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskWorkerExcuteReqVO; @@ -13,6 +12,8 @@ import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.App import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.AppGardenApprovalDetailRespVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.*; import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import jakarta.validation.Valid; /** * @author yanhuiqing diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index 9bc8680..78532bb 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -2,12 +2,10 @@ package com.zteits.urbanops.module.workorder.service.garden; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.common.util.object.ObjectUtils; -import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.bpm.api.task.BpmProcessInstanceApi; import com.zteits.urbanops.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; @@ -21,12 +19,11 @@ import com.zteits.urbanops.module.bpm.service.definition.BpmProcessDefinitionSer import com.zteits.urbanops.module.bpm.service.task.BpmProcessInstanceService; import com.zteits.urbanops.module.bpm.service.task.BpmTaskService; import com.zteits.urbanops.module.garden.api.road.RoadApi; -import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO; +import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO; import com.zteits.urbanops.module.system.api.user.AdminUserApi; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; +import com.zteits.urbanops.module.workorder.api.WorkOrderApi; import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; -import com.zteits.urbanops.module.workorder.api.workorder.WorkOrderApi; -import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderCreateReqVO; import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoHasTaskPageReqVO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO; @@ -46,6 +43,8 @@ import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoExtD import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMapper; import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper; import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; +import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.util.TaskNodeUtils; import jakarta.annotation.Resource; import org.flowable.engine.RuntimeService; @@ -61,7 +60,6 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.stream.Collectors; import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java index bffc13a..39b6495 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java @@ -3,9 +3,7 @@ package com.zteits.urbanops.module.workorder.service.materialdetail; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.api.material.MaterialApi; -import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto; -import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO; -import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService; +import com.zteits.urbanops.module.garden.dto.material.MaterialInventoryOutDto; import com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo.MaterialDetailPageReqVO; import com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo.MaterialDetailSaveReqVO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;