diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java index f5d3233..89c9f91 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java @@ -149,7 +149,7 @@ public class DingInfoPullController { projectDto.setProjectCode(row.getCell(0).toString()); projectDto.setProjectName(row.getCell(1).toString()); projectDto.setArea(row.getCell(2).toString()); - projectDto.setAreaCode(row.getCell(3).toString()); + projectDto.setAreaCode("331123000"); String baseProjType = String.valueOf(row.getCell(4)); if(StringUtils.isNotBlank(baseProjType) && baseProjType.contains(".")){ baseProjType = baseProjType.substring(0, diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java new file mode 100644 index 0000000..56e0dd3 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java @@ -0,0 +1,48 @@ +package com.ningdatech.pmapi.gov.controller; + + +import com.ningdatech.pmapi.gov.manage.BelongOrgManage; +import com.ningdatech.pmapi.gov.model.vo.GovBusinessStripVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *
+ * 前端控制器 + *
+ * + * @author zpf + * @since 2023-08-21 + */ +@Slf4j +@Validated +@RestController +@RequiredArgsConstructor +@Api(value = "GovProjectCollectionController", tags = "电子政务规范项目归集控制器") +@RequestMapping("/api/v1/gov-project-collection") +public class GovProjectCollectionController { + + private final BelongOrgManage belongOrgManage; + + @GetMapping("/dictionary") + @ApiOperation("获取条线列表") + public List