From f7360d9de337db173481c1050595f1326d9f6911 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 13 Sep 2023 14:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformProjectNameInfoEOController.java  | 21 ++++++++++---------
 .../PlatformProjectNameInfoEOServiceImpl.java | 12 ++---------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
index 5436884d1..b857754e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
@@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.service.IProjectNameInfoEOService;
@@ -44,7 +45,7 @@ import java.util.List;
 @Slf4j
 public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
 	@Autowired
-	private IProjectNameInfoEOService projectNameInfoEOService;
+	private IPlatformProjectNameInfoEOService platformProjectNameInfoEOService;
 
 	/**
 	 * 分页列表查询
@@ -64,7 +65,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 								   HttpServletRequest req) {
 		QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap());
 		Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize);
-		IPage<ProjectNameInfoEO> pageList = projectNameInfoEOService.page(page, queryWrapper);
+		IPage<ProjectNameInfoEO> pageList = platformProjectNameInfoEOService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -77,7 +78,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
     @ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<ProjectNameInfoEO>> queryList() {
-		List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
+		List<ProjectNameInfoEO> list = platformProjectNameInfoEOService.queryList();
 		return Result.OK(list);
 	}
     /**
@@ -89,7 +90,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
     @ApiOperation(value="返回项目全拼", notes="返回项目全拼")
 	@GetMapping(value = "/queryProjectNameList")
 	public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) {
-		List<ProjectLibraryBase> list = projectNameInfoEOService.queryProjectNameList(cut);
+		List<ProjectLibraryBase> list = platformProjectNameInfoEOService.queryProjectNameList(cut);
 		return Result.OK(list);
 	}
 
@@ -103,7 +104,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
-		projectNameInfoEOService.add(projectNameInfoEO);
+		platformProjectNameInfoEOService.add(projectNameInfoEO);
 		return Result.OK("添加成功！");
 	}
 
@@ -117,7 +118,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
-		projectNameInfoEOService.editById(projectNameInfoEO);
+		platformProjectNameInfoEOService.editById(projectNameInfoEO);
 		return Result.OK("编辑成功!");
 	}
 
@@ -131,7 +132,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		projectNameInfoEOService.deleteById(id);
+		platformProjectNameInfoEOService.deleteById(id);
 		return Result.OK("删除成功!");
 	}
 
@@ -145,7 +146,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.projectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		this.platformProjectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 
@@ -159,7 +160,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 	@ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOService.queryById(id);
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOService.queryById(id);
 		if(projectNameInfoEO==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -198,6 +199,6 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
 //	 @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
 //	 @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
 //	 public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
-//		 projectNameInfoEOService.getSpaceInfo(cut);
+//		 platformProjectNameInfoEOService.getSpaceInfo(cut);
 //	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
index d6f134d81..7da3631ee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
@@ -3,16 +3,14 @@ package com.jero.modules.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.vo.DictModel;
+import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.entity.ProjectYearNameInfoEO;
 import com.jero.modules.project.mapper.ProblemManagementEOMapper;
-import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
 import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
-import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
-import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
-import com.jero.modules.space.service.SpaceServiceImpl;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.util.StringUtils;
@@ -31,12 +29,6 @@ import java.util.List;
  */
 @Service
 public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatformProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
-	@Autowired
-	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
-
-	@Autowired
-	private SpaceServiceImpl spaceService;
-
 	@Autowired
 	private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
 	@Autowired