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 index 4532c35..fce06e3 100644 --- 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 @@ -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 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 d0b724c..43b824e 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 @@ -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 getRoadInfoBy(RoadReqDTO reqDTO) { Map 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); + } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java new file mode 100644 index 0000000..8633552 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadStreetRespDTO.java @@ -0,0 +1,25 @@ +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; +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/GardenWebConfiguration.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/GardenWebConfiguration.java new file mode 100644 index 0000000..f597c85 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/GardenWebConfiguration.java @@ -0,0 +1,24 @@ +package com.zteits.urbanops.module.garden.framework.web.config; + +import com.zteits.urbanops.framework.swagger.config.UrbanopsSwaggerAutoConfiguration; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * erp 模块的 web 组件的 Configuration + * + * @author ZIEITS + */ +@Configuration(proxyBeanMethods = false) +public class GardenWebConfiguration { + + /** + * erp 模块的 API 分组 + */ + @Bean + public GroupedOpenApi erpGroupedOpenApi() { + return UrbanopsSwaggerAutoConfiguration.buildGroupedOpenApi("garden"); + } + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/package-info.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/package-info.java new file mode 100644 index 0000000..15de522 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/config/package-info.java @@ -0,0 +1 @@ +package com.zteits.urbanops.module.garden.framework.web.config; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/package-info.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/package-info.java new file mode 100644 index 0000000..b9aa3fe --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/web/package-info.java @@ -0,0 +1 @@ +package com.zteits.urbanops.module.garden.framework.web; diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/package-info.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/package-info.java new file mode 100644 index 0000000..67f0fd7 --- /dev/null +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/package-info.java @@ -0,0 +1 @@ +package com.zteits.urbanops.module.gloabl.framework; diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/confing/GloablWebConfiguration.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/confing/GloablWebConfiguration.java new file mode 100644 index 0000000..526f160 --- /dev/null +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/confing/GloablWebConfiguration.java @@ -0,0 +1,24 @@ +package com.zteits.urbanops.module.gloabl.framework.web.confing; + +import com.zteits.urbanops.framework.swagger.config.UrbanopsSwaggerAutoConfiguration; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * erp 模块的 web 组件的 Configuration + * + * @author ZIEITS + */ +@Configuration(proxyBeanMethods = false) +public class GloablWebConfiguration { + + /** + * erp 模块的 API 分组 + */ + @Bean + public GroupedOpenApi erpGroupedOpenApi() { + return UrbanopsSwaggerAutoConfiguration.buildGroupedOpenApi("gloabl"); + } + +} diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/package-info.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/package-info.java new file mode 100644 index 0000000..62d6f99 --- /dev/null +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/framework/web/package-info.java @@ -0,0 +1 @@ +package com.zteits.urbanops.module.gloabl.framework.web; 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 4334edb..9f5402b 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 @@ -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);