工单管理代码提交

颜惠青
1 parent c1c40f78
Showing 4 changed files with 63 additions and 15 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -2,6 +2,7 @@ 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;
@@ -13,4 +14,6 @@ import java.util.List;
  */
 public interface RoadApi {
     public List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO);
+
+    public RoadStreetRespDTO getRoadInfoById(Long id);
 }
@@ -4,8 +4,13 @@ import cn.hutool.json.JSONObject;
 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.service.road.RoadService;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -28,7 +33,8 @@ public class RoadApiImpl implements RoadApi{
     @Value("${siot.roadUrl}")
     private String roadInfoUrl;
-
+    @Resource
+    private RoadService roadService;
     @Override
     public List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO) {
         Map<String, Object> param = new HashMap<>();
@@ -54,4 +60,10 @@ public class RoadApiImpl implements RoadApi{
             return roadInfo;
         }).collect(Collectors.toList());
     }
+
+    @Override
+    public RoadStreetRespDTO getRoadInfoById(Long id) {
+        RoadRespVO roadRespVO = roadService.getRoad(id);
+        return  BeanUtils.toBean(roadRespVO, RoadStreetRespDTO.class);
+    }
 }
+package com.zteits.urbanops.module.garden.api.road.dto;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: 获取道路对应的街道信息
+ * @date 2025/12/10 23:30
+ */
+@Data
+public class RoadStreetRespDTO {
+
+    private Long id;
+
+    private String roadName;
+
+    private String streetId;
+
+    private String streetName;
+
+    private String busiLine;
+}
@@ -8,6 +8,8 @@ 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.garden.api.road.RoadApi;
+import com.zteits.urbanops.module.garden.api.road.dto.RoadStreetRespDTO;
 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;
@@ -52,6 +54,9 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Resource
     private WorkOrderApi workOrderApi;
+    @Resource
+    private RoadApi roadApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrderQuick(AppGardenWorkOrderReqVO createRequestVo) {
@@ -62,17 +67,20 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         // 插入 工单
         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("园林工单");
+
+        RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
+        workOrder.setStreetId(roadStreetRespDTO.getStreetId());
+        workOrder.setStreetName(roadStreetRespDTO.getStreetName());
+
+        //workOrder.setBuzStatus("t1");//需给出映射关系
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
         workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
         workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
+        workOrder.setCommitDate(LocalDateTime.now());
+        String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_QUICK);
+        workOrder.setOrderNo(workOrderNum);
+        //workOrder.setOrderName("园林工单");
         workOrderMapper.insert(workOrder);
         //附件插入
@@ -100,19 +108,19 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
                 .setStatus(BpmTaskStatusEnum.NOT_START.getStatus());
-        //TODO 设置其它值 需从道路表获取
-        workOrder.setStreetId("test");
+        RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
+        workOrder.setStreetId(roadStreetRespDTO.getStreetId());
+        workOrder.setStreetName(roadStreetRespDTO.getStreetName());
         //workOrder.setBuzStatus("t1");//需给出映射关系
-        //workOrder.setCommitDate(LocalDateTime.now());
+        workOrder.setCommitDate(LocalDateTime.now());
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
+        workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        workOrder.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
+        workOrder.setCommitDate(LocalDateTime.now());
         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);