Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents 5434f62e 612dd071
Showing 16 changed files with 427 additions and 59 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDetailDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApi.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmQuickProcessTaskAutoCompleteListener.java
@@ -52,6 +52,14 @@ public class InspectionPlanDetailRespVO {
     @ExcelProperty("执行时间")
     private LocalDateTime endTime;
+    @Schema(description = "计划次数")
+    @ExcelProperty("计划次数")
+    private Integer planNum;
+
+    @Schema(description = "完成次数")
+    @ExcelProperty("完成次数")
+    private Integer planFinishNum;
+
     @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成状态 1:未完成;2:进行中;3:已完成")
     private Integer finishState;
@@ -51,6 +51,10 @@ public class MaintainPlanDetailRespVO {
     @ExcelProperty("执行时间")
     private LocalDateTime endTime;
+    @Schema(description = "计划次数")
+    @ExcelProperty("计划次数")
+    private Integer planNum;
+
     @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("完成百分比")
     private Double finishPercent;
@@ -57,6 +57,15 @@ public class InspectionPlanDetailDO extends BaseDO {
      * 排序号:第n次计划
      */
     private Integer sortNum;
+
+    /**
+     * 计划次数
+     */
+    private Integer planNum;
+    /**
+     * 已完成次数
+     */
+    private Integer planFinishNum;
     /**
      * 执行开始时间
      */
@@ -55,6 +55,7 @@ public class MaintainPlanDetailDO extends BaseDO {
      * 排序号:第n次计划
      */
     private Integer sortNum;
+
     /**
      * 执行开始时间
      */
@@ -63,6 +64,12 @@ public class MaintainPlanDetailDO extends BaseDO {
      * 执行时间
      */
     private LocalDateTime endTime;
+
+    /**
+     * 计划次数
+     */
+    private Integer planNum;
+
     /**
      * 完成百分比
      */
@@ -90,10 +90,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
             log.warn("获取两个时间之间间隔天数错误");
             return CommonResult.error(INSPECTION_CYCLE_ERROR);
         }
-        //计算计划次数
-        Integer planNum = calculate.size();
-
+        //计算计划次数
+        int planNum = calculate.stream().mapToInt(PeriodResult::getCount).sum();
         //巡检计划list
         List<InspectionPlanDO> inspectionPlanList = new ArrayList<>();
         //角色列表
@@ -138,13 +137,16 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
                 roleList.add(inspectionPlanRoleDO);
             });
             /*3.插入巡查计划明细*/
+            int index = 1;
             for (PeriodResult periodResult : calculate) {
                 InspectionPlanDetailDO entity = getInspectionPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
                 ThreadUtil.sleep(2);
-                entity.setSortNum(periodResult.getCount());
+                entity.setSortNum(index);
+                entity.setPlanNum(periodResult.getCount());
                 entity.setBeginTime(LocalDateTime.parse(periodResult.getStart() + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 entity.setEndTime(LocalDateTime.parse(periodResult.getEnd() + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 detailDOList.add(entity);
+                index++;
             }
         });
@@ -93,7 +93,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             return CommonResult.error(INSPECTION_CYCLE_ERROR);
         }
         //计算计划次数
-        Integer planNum = calculate.size();
+        int planNum = calculate.stream().mapToInt(PeriodResult::getCount).sum();
         //巡检计划list
         List<MaintainPlanDO> maintainPlanList = new ArrayList<>();
         //角色列表
@@ -138,13 +138,16 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
                 roleList.add(maintainPlanRoleDO);
             });
             /*3.插入巡查计划明细*/
+            int index =1;
             for (PeriodResult periodResult : calculate) {
                 MaintainPlanDetailDO entity = getMaintainPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
                 ThreadUtil.sleep(2);
-                entity.setSortNum(periodResult.getCount());
+                entity.setSortNum(index);
+                entity.setPlanNum(periodResult.getCount());
                 entity.setBeginTime(LocalDateTime.parse(periodResult.getStart() + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 entity.setEndTime(LocalDateTime.parse(periodResult.getEnd() + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 detailDOList.add(entity);
+                index++;
             }
         });
@@ -11,7 +11,7 @@ import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.INSPECT
 /**
  * 时间区间拆分+频次计算工具类
- * 支持：按日/周/月/年拆分，区间临界点重叠，动态计算每个区间的执行频次
+ * 支持：按日/周/月/年拆分，基于固定天数换算（周=7天，月=30天，年=365天）
  */
 public class TimeIntervalFrequencyUtil {
@@ -42,12 +42,12 @@ public class TimeIntervalFrequencyUtil {
     }
     /**
-     * 计算时间段划分结果
+     * 计算时间段划分结果（基于固定天数换算）
      *
      * @param startStr 开始日期 (yyyy-MM-dd)
      * @param endStr   结束日期 (yyyy-MM-dd)
      * @param freq     频次值，格式 "x/y"
-     * @param cycleId     cycleId 1:日/次；2:周/次；3:月/次；4:年/次
+     * @param cycleId  1:日/次；2:周/次；3:月/次；4:年/次
      * @return 划分结果列表
      */
     public static List<PeriodResult> calculate(String startStr, String endStr, String freq, Integer cycleId) {
@@ -62,31 +62,29 @@ public class TimeIntervalFrequencyUtil {
         if (parts.length != 2) {
             throw new IllegalArgumentException("频次值格式错误，应为 'x/y': " + freq);
         }
-        int x = Integer.parseInt(parts[0]);
-        int y = Integer.parseInt(parts[1]);
+        int x = Integer.parseInt(parts[0]); // 每周期次数
+        int y = Integer.parseInt(parts[1]); // 周期数量
         IntervalUnit unit = getIntervalUnit(cycleId);
+        long periodDays = convertToDays(y, unit); // 转为固定天数
         List<PeriodResult> results = new ArrayList<>();
         LocalDate currentStart = start;
         while (!currentStart.isAfter(end)) {
-            // 计算当前周期的理论结束日期（包含 y 个单位）
-            LocalDate periodEnd = calculatePeriodEnd(currentStart, y, unit);
-
-            // 实际段结束 = min(periodEnd, end)
-            LocalDate segEnd = periodEnd.isAfter(end) ? end : periodEnd;
+            // 当前段理论结束 = currentStart + periodDays - 1
+            LocalDate currentEnd = safePlusDays(currentStart, periodDays - 1);
+            if (currentEnd.isAfter(end)) {
+                currentEnd = end; // 截断
+            }
-            results.add(new PeriodResult(currentStart, segEnd, x));
+            results.add(new PeriodResult(currentStart, currentEnd, x));
             // 下一段从当前段结束的第二天开始
-            LocalDate nextStart = segEnd.plusDays(1);
-
-            // 如果已经超过总结束时间，则终止
+            LocalDate nextStart = currentEnd.plusDays(1);
             if (nextStart.isAfter(end)) {
                 break;
             }
-
             currentStart = nextStart;
         }
@@ -94,62 +92,70 @@ public class TimeIntervalFrequencyUtil {
     }
     /**
-     * 计算从 start 开始，经过 y 个单位周期后的结束日期（包含）
+     * 将 y 个单位转换为固定天数
      */
-    private static LocalDate calculatePeriodEnd(LocalDate start, int y, IntervalUnit unit) {
+    private static long convertToDays(int y, IntervalUnit unit) {
         switch (unit) {
             case DAY:
-                return start.plusDays(y - 1); // 包含 y 天：start 到 start+y-1
+                return y;
             case WEEK:
-                return start.plusDays((long) y * 7 - 1); // y周 = y*7天，减1得包含结束
+                return (long) y * 7;
             case MONTH:
-                return addMonthsSafely(start, y).minusDays(1);
+                return (long) y * 30;
             case YEAR:
-                return start.plusYears(y).minusDays(1);
+                return (long) y * 365;
             default:
-                throw new UnsupportedOperationException("未支持的单位: " + unit);
+                throw new UnsupportedOperationException("不支持的单位: " + unit);
         }
     }
-
-
     /**
-     * 安全地加上 y 个月（避免3月31日+1月变成异常）
-     * 这里使用 Java 8+ 的 plusMonths 自动调整规则
+     * 安全地加天数（防止溢出）
      */
-    private static LocalDate addMonthsSafely(LocalDate date, int months) {
-        return date.plusMonths(months);
-        // Java 会自动处理：如 1月31日 +1月 → 2月28/29日（不会抛异常）
+    private static LocalDate safePlusDays(LocalDate date, long days) {
+        if (days == 0) return date;
+        try {
+            return date.plusDays(days);
+        } catch (ArithmeticException e) {
+            return days > 0 ? LocalDate.MAX : LocalDate.MIN;
+        }
     }
-
-
-
     // ====================== 测试用例 ======================
-   //cycleId 1:日/次；2:周/次；3:月/次；4:年/次
     public static void main(String[] args) {
-        System.out.println("=== 示例1：每3天一次，按日 ===");
-        List<PeriodResult> r1 = calculate("2025-01-01", "2025-01-07", "1/3", 1);
+        //1:日/次；2:周/次；3:月/次；4:年/次
+        System.out.println("=== 示例1：每2天3次(即：3/2)，按日 ===2025-12-01 2025-12-31");
+        List<PeriodResult> r1 = calculate("2025-12-01", "2025-12-31", "3/2", 1);
         r1.forEach(System.out::println);
-
-        System.out.println("\n=== 示例2：每3周一次（21天），按周 ===");
-        List<PeriodResult> r2 = calculate("2025-01-01", "2025-02-08", "1/2", 2);
+        // 输出：
+        // 2025-01-01 2025-01-03 1次
+        // 2025-01-04 2025-01-06 1次
+        // 2025-01-07 2025-01-07 1次
+        System.out.println("\n=== 示例2：每2周3次(即：3/2)（14天），按周 ===2025-12-01 2025-12-10");
+        List<PeriodResult> r2 = calculate("2025-12-01", "2025-12-10", "3/2", 2);
         r2.forEach(System.out::println);
-
-        System.out.println("\n=== 示例3：每5个月一次，按月 ===");
-        List<PeriodResult> r3 = calculate("2025-11-01", "2025-12-31", "5/1", 3);
+        // 每2周 = 14天
+        // 2025-01-01 ~ 2025-01-14
+        // 2025-01-15 ~ 2025-01-28
+        // 2025-01-29 ~ 2025-02-08（剩余11天）
+        System.out.println("\n=== 示例3：每2个月4次(即：4/2)（30天），按月 === 2025-09-15 2025-12-31");
+        List<PeriodResult> r3 = calculate("2025-09-15", "2025-12-31", "4/2", 3);
         r3.forEach(System.out::println);
+        // 每1月 = 30天
+        // 2025-01-01 ~ 2025-01-30
+        // 2025-01-31 ~ 2025-02-28（30天？→ 实际是29天，但按30天算）
+        // 2025-03-01 ~ 2025-03-15（不足）
-        System.out.println("\n=== 示例4：每3年一次，按年 ===");
-        List<PeriodResult> r4 = calculate("2025-01-01", "2035-06-01", "1/3", 3);
+        System.out.println("\n=== 示例4：每2年1次(即：1/2)（730天），按年 ===2025-01-01 2030-01-01");
+        List<PeriodResult> r4 = calculate("2025-01-01", "2030-01-01", "1/2", 4);
         r4.forEach(System.out::println);
-
-        System.out.println("\n=== 示例5：每2天2次，按日 ===");
-        List<PeriodResult> r5 = calculate("2025-01-01", "2025-01-05", "2/2", 1);
+        // 每2年 = 730天
+        // 2025-01-01 ~ 2025-12-26（+729d）
+        // 2025-12-27 ~ 2027-12-21
+        // 2027-12-22 ~ 2029-12-16
+        // 2029-12-17 ~ 2030-01-01（最后一段）
+        System.out.println("\n=== 示例5：每1年4次(即：4/1)，按年（测试）=== 2023-09-15 2025-01-31");
+        List<PeriodResult> r5 = calculate("2023-09-15", "2025-01-31", "4/1", 4);
         r5.forEach(System.out::println);
-
-        System.out.println("\n=== 示例5：每2年1次，按年 ===");
-        List<PeriodResult> r6 = calculate("2025-01-01", "2028-01-05", "1/2", 4);
-        r6.forEach(System.out::println);
     }
-}
 \ No newline at end of file
+}
@@ -8,6 +8,10 @@ package com.zteits.urbanops.module.workorder.api.constant;
  */
 public  class BpmCommonConstant {
     /**
+     * 通用快速流程
+     */
+    public static final String COMMON_QUICK_PROCESS = "common_quick_process";
+    /**
      * 园林巡检工单 流程业务key
      */
     public static final String BPM_GARDEN_INSPECT_WO = "garden_inspect_wo";
@@ -31,5 +35,13 @@ public  class BpmCommonConstant {
      * 园林远景图片类型
      */
     public static final String GARDEN_INSPECT_WO_ATTACH3 = "03";
+    /**
+     * 园林工单编号前缀
+     */
+    public static final String WORK_ORDER_PREFFIX_GARDEN = "GWO";
+    /**
+     * 快速工单编号前缀
+     */
+    public static final String WORK_ORDER_PREFFIX_QUICK = "QWO";
 }
+package com.zteits.urbanops.module.workorder.api.workorder;
+
+public interface WorkOrderApi {
+    /**
+     * 生成工单编号
+     * @param prefix 前缀，为空时：workorder
+     * @return
+     */
+    public String generateWONum(String prefix);
+}
+package com.zteits.urbanops.module.workorder.api.workorder;
+
+import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: 工单对外api
+ * @date 2025/12/5 17:21
+ */
+@Service
+public class WorkOrderApiImpl implements WorkOrderApi{
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+    private static final AtomicInteger counter = new AtomicInteger(1);
+
+    @Override
+    public String generateWONum(String prefix) {
+        if (ObjectUtils.isEmpty(prefix)) {
+            prefix = BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN;
+        }
+        String dateStr = LocalDateTime.now().format(DATE_FORMAT);
+        int seqNum = counter.getAndIncrement();
+        if(seqNum>999){
+            synchronized (counter) {
+                if (counter.intValue() > 999) {
+                    counter.set(1);
+                }
+                seqNum = counter.getAndIncrement();
+            }
+        }
+        return String.format("%s%03d_%s", prefix, seqNum,dateStr);
+    }
+}
+package com.zteits.urbanops.module.workorder.controller.app.garden;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO;
+import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderRespVO;
+import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO;
+import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO;
+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 static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: app端 园林工单请求入口
+ * @date 2025/12/6 10:07
+ */
+@Tag(name = "APP - 园林工单bpm")
+@RestController
+@RequestMapping("/app/garden/workorder")
+public class AppGardenWorkOrderController {
+    @Resource
+    private BpmGardenService gardenService;
+
+    @PostMapping("/create")
+    @Operation(summary = "app-创建工单信息")
+    public CommonResult<Long> createMainInfo(@Valid @RequestBody AppGardenWorkOrderReqVO createReqVO) {
+        return success(gardenService.createWorkOrder(createReqVO));
+    }
+
+    @PostMapping("/createQuick")
+    @Operation(summary = "app-创建快速工单信息")
+    public CommonResult<Long> createMainInfoQuick(@Valid @RequestBody AppGardenWorkOrderReqVO createReqVO) {
+        return success(gardenService.createWorkOrderQuick(createReqVO));
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "app-获得工单详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<BpmGardenWorkOrderRespVO> getGardenInspection(@RequestParam("id") Long id) {
+        BpmGardenWorkOrderDO gardenInspection = gardenService.getWorkOrder(id);
+        return success(BeanUtils.toBean(gardenInspection, BpmGardenWorkOrderRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "app-获得园林巡检工单申请分页")
+    public CommonResult<PageResult<BpmGardenWorkOrderRespVO>> getGardenInspectionPage(@Valid BpmGardenWorkOrderPageReqVO pageVO) {
+        PageResult<BpmGardenWorkOrderDO> pageResult = gardenService.getGardenInspectionPage(getLoginUserId(), pageVO);
+        return success(BeanUtils.toBean(pageResult, BpmGardenWorkOrderRespVO.class));
+    }
+
+}
+package com.zteits.urbanops.module.workorder.controller.app.garden.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: app端请求参数
+ * @date 2025/12/6 10:17
+ */
+@Schema(description = "APP-园林工单请求创建 Request VO")
+@Data
+public class AppGardenWorkOrderReqVO {
+
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
+    @NotNull(message = "道路ID不能为空")
+    private Long roadId;
+
+    @Schema(description = "问题图片", example = "9184")
+    private List<String> imgs;
+
+    @Schema(description = "处理完成照片", example = "9184")
+    private List<String> longRangeImgList;
+
+    @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
+    @NotEmpty(message = "工单描述不能为空")
+    @Length(max = 500)
+    private String remark;
+
+    @NotEmpty(message = "经纬度类型")
+    @Schema(description = "经纬度类型: 1:国标; 2：百度；3：高德；4：腾讯", example = "2")
+    private Integer latLonType;
+
+    @Schema(description = "经度", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "经度不能为空")
+    private BigDecimal lat;
+
+    @Schema(description = "维度", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "维度不能为空")
+    private BigDecimal lon;
+
+    @Schema(description = "经纬度地址", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "经纬度地址不能为空")
+    private String lonLatAddress;
+
+    @Schema(description = "紧急程度：1:特急;2:紧急;3:一般", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "紧急程度：1:特急;2:紧急;3:一般不能为空")
+    private Integer pressingType;
+
+    @Schema(description = "工单名称", example = "绿地卫生")
+    private String orderName;
+
+    @Schema(description = "来源ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    //@NotNull(message = "来源ID不能为空")
+    private Integer sourceId;
+
+    @Schema(description = "来源名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "园林")
+    //@NotEmpty(message = "来源名称不能为空")
+    private String  sourceName;
+
+    @Schema(description = "三方工单ID")
+    private String thirdWorkNo;
+
+   /* @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
+    private Map<String, List<Long>> startUserSelectAssignees;
+
+    @Schema(description = "是否需要养护人员修复，'0' 是,'1' 否")
+    private String isYesOrNo;*/
+
+
+}
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.workorder.service.garden;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 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.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO;
 import jakarta.validation.Valid;
 /**
@@ -13,6 +14,12 @@ import jakarta.validation.Valid;
  */
 public interface BpmGardenService {
     /**
+     * 园林工单申请 app service 接口
+     * @param createRequestVo
+     * @return
+     */
+    Long createWorkOrder(@Valid AppGardenWorkOrderReqVO createRequestVo);
+    /**
      * 园林工单申请 Service 接口
      * @param userId
      * @param createRequestVo
@@ -43,4 +50,11 @@ public interface BpmGardenService {
      * @return
      */
     PageResult<BpmGardenWorkOrderDO> getGardenInspectionPage(Long loginUserId, BpmGardenWorkOrderPageReqVO pageVO);
+
+    /**
+     * 快速流程
+     * @param createReqVO
+     * @return
+     */
+    Long createWorkOrderQuick(@Valid AppGardenWorkOrderReqVO createReqVO);
 }
@@ -4,13 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.bpm.api.task.BpmProcessInstanceApi;
 import com.zteits.urbanops.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import com.zteits.urbanops.module.bpm.enums.task.BpmTaskStatusEnum;
+import com.zteits.urbanops.module.bpm.service.task.BpmProcessInstanceService;
 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.MainInfoPageReqVO;
+import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
@@ -45,6 +49,74 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     private MainInfoMapper workOrderMapper;
     @Resource
     private BpmProcessInstanceApi processInstanceApi;
+    @Resource
+    private WorkOrderApi workOrderApi;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createWorkOrderQuick(AppGardenWorkOrderReqVO createRequestVo) {
+
+        List<String> imgList =  createRequestVo.getImgs();
+        //List<String> streetImgList = createRequestVo.getStreetImgList();
+        List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
+        // 插入 工单
+        MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
+                .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        //TODO 设置其它值 需从道路表获取
+        workOrder.setStreetId("test");
+        workOrder.setBuzStatus("t1");//需给出映射关系
+        workOrder.setCommitDate(LocalDateTime.now());
+        String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_QUICK);
+        workOrder.setOrderNo(workOrderNum);
+        workOrder.setOrderName("园林工单");
+        workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
+        workOrderMapper.insert(workOrder);
+
+        //附件插入
+        attachmentApend(imgList,null,longRangeImgList,workOrder);
+        // 发起 BPM 流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        processInstanceVariables.put("workOrder", workOrder);
+        processInstanceVariables.put("imgList", imgList);
+        processInstanceVariables.put("longRangeImgList", longRangeImgList);
+        String processInstanceId = processInstanceApi.createProcessInstance(SecurityFrameworkUtils.getLoginUserId(),
+                new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmCommonConstant.COMMON_QUICK_PROCESS)
+                        .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(workOrder.getId())));
+
+        // 将工作流的编号，更新到 工单中
+        workOrderMapper.updateById(new MainInfoDO().setId(workOrder.getId()).setProcessInstanceId(processInstanceId));
+        return workOrder.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
+        List<String> imgList =  createRequestVo.getImgs();
+        //List<String> streetImgList = createRequestVo.getStreetImgList();
+        List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
+
+        MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
+                .setStatus(BpmTaskStatusEnum.NOT_START.getStatus());
+        //TODO 设置其它值 需从道路表获取
+        workOrder.setStreetId("test");
+        //workOrder.setBuzStatus("t1");//需给出映射关系
+        //workOrder.setCommitDate(LocalDateTime.now());
+        workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
+        String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
+        workOrder.setOrderNo(workOrderNum);
+        //workOrder.setOrderName("园林工单");
+        Long userId = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+        String nickname = com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname();
+        workOrder.setUserId(userId);
+        workOrder.setUserName(nickname);
+        workOrderMapper.insert(workOrder);
+        //附件插入
+        attachmentApend(imgList,null,longRangeImgList,workOrder);
+        return workOrder.getId();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrder(Long userId, BpmGardenWorkOrderCreateReqVo createRequestVo) {
@@ -59,6 +131,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setStreetId("test");
         workOrder.setBuzStatus("t1");//需给出映射关系
         workOrder.setCommitDate(LocalDateTime.now());
+        String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
+        workOrder.setOrderNo(workOrderNum);
+        workOrder.setOrderName("园林工单");
+        workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+        workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
         workOrderMapper.insert(workOrder);
         //附件插入
@@ -160,4 +237,6 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         PageResult<BpmGardenWorkOrderDO>  targetList = BeanUtils.toBean(pageList,BpmGardenWorkOrderDO.class);
         return targetList;
     }
+
+
 }
@@ -2,6 +2,7 @@ package com.zteits.urbanops.module.workorder.service.garden.listener;
 import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
 import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
@@ -13,13 +14,13 @@ import org.springframework.stereotype.Component;
  * @date 2025/12/1 11:45
  */
 @Component
-public class BomGardenWorkOrderStatusListener extends BpmProcessInstanceStatusEventListener {
+public class BpmGardenWorkOrderStatusListener extends BpmProcessInstanceStatusEventListener {
     @Resource
     private BpmGardenService gardenService;
     @Override
     protected String getProcessDefinitionKey() {
-        return null;
+        return BpmCommonConstant.BPM_GARDEN_INSPECT_WO;
     }
     @Override
+package com.zteits.urbanops.module.workorder.service.garden.listener;
+
+import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
+import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
+import jakarta.annotation.Resource;
+import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: 快速处理流程的任务自动完成监听器
+ * @date 2025/12/6 14:00
+ */
+@Component
+public class BpmQuickProcessTaskAutoCompleteListener extends BpmProcessInstanceStatusEventListener {
+    @Resource
+    private BpmGardenService gardenService;
+    @Override
+    protected String getProcessDefinitionKey() {
+        return BpmCommonConstant.COMMON_QUICK_PROCESS;
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        gardenService.updateWorkOrderStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
+
+    }
+}