From 13ffee9729904882288089fb796fd7adc8387119 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 13 Sep 2023 14:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlatformProjectLibraryBaseController.java | 6 +-- ...> IPlatformProjectLibraryBaseService.java} | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 48 ++++++++----------- ...PlatformProjectLibraryBaseServiceImpl.java | 4 +- 4 files changed, 27 insertions(+), 33 deletions(-) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/{IPlatformIProjectLibraryBaseService.java => IPlatformProjectLibraryBaseService.java} (97%) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java index 42453f1de..9307bbfe8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java @@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.DictModel; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService; +import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -44,9 +44,9 @@ import java.util.Map; @RestController @RequestMapping("/platform/projectLibraryBase") @Slf4j -public class PlatformProjectLibraryBaseController extends JeroController { +public class PlatformProjectLibraryBaseController extends JeroController { @Autowired - private IPlatformIProjectLibraryBaseService platformIProjectLibraryBaseService; + private IPlatformProjectLibraryBaseService platformIProjectLibraryBaseService; /** * 分页列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java index 76b51e0d9..5b067b8be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java @@ -20,7 +20,7 @@ import java.util.Map; * @Date: 2022-04-11 * @Version: V1.0 */ -public interface IPlatformIProjectLibraryBaseService extends IService { +public interface IPlatformProjectLibraryBaseService extends IService { /** * 保存 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 775043f28..3ddd759b8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -20,7 +20,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; -import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; @@ -31,6 +30,11 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper; +import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; +import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; +import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; +import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; @@ -54,16 +58,11 @@ import com.jero.modules.project.enums.ReviewResultEnum; import com.jero.modules.project.enums.RoleRelModelTypeEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; -import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.service.IProjectUserPermissionService; -import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper; -import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; -import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; @@ -73,7 +72,6 @@ import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysRoleMapper; -import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; @@ -168,7 +166,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private SysDictItemServiceImpl sysDictItemServiceImpl; @Autowired - private IProjectLibraryBaseService projectLibraryBaseService; + private IPlatformProjectLibraryBaseService platformProjectLibraryBaseService; @Autowired private IProcessInfoEOService processInfoEOService; @Autowired @@ -182,8 +180,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private IFeishuService feishuService; @Autowired - private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService; - @Autowired private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService; @Autowired private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService; @@ -200,7 +196,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService; @Autowired - private ProjectLibraryBaseMapper projectLibraryBaseMapper; + private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper; @Value(value = "${jero.backUrl}") @@ -222,8 +218,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private IOSSFileService iOSSFileService; @Autowired - private SysUserMapper sysUserMapper; - @Autowired private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService; @Autowired private IProcessHistoryEOService processHistoryEOService; @@ -360,7 +354,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI //获取当前项目库id的studio工程师和认证工程师 List studionList = new ArrayList<>(); List certificationEngineerList = new ArrayList<>(); - List projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut); + List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectId, cut); for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){ studionList.add(projectLibraryBase.getStudioEngineer()); @@ -460,7 +454,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { @@ -518,7 +512,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { @@ -773,7 +767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ // 同步更新待办中心-流程明细截止日期 this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos); @@ -1023,7 +1017,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI // }).collect(Collectors.toList()); // // if (CollectionUtils.isNotEmpty(pciEoListTemp)) { -// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId()); +// ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId()); // if(ObjectUtils.isNotEmpty(projectLibraryBase)){ // List userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); // List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); @@ -1094,7 +1088,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String contentEn){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1555,7 +1549,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } // 获取项目信息，获取认证工程师，给认证工程师分配待办任务 - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1701,7 +1695,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //项目详情中取R&H Studio和认证工程师 - List projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null); + List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId,null); String certificationEngineerName = ""; if(projectLibraryBases.size() != 0){ certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); @@ -2216,7 +2210,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3546,7 +3540,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String operatorType = json.getString("operatorType"); String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3689,7 +3683,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String transferUserId = json.getString("transferUserId"); SysUser transferUserInfo = this.sysUserService.getById(transferUserId); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3832,7 +3826,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 if(ObjectUtils.isEmpty(projectLibraryBase)){ @@ -5813,7 +5807,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CollectionUtils.isNotEmpty(pciList)){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String projectLibraryId = pciList.get(0).getProjectLibraryId(); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); @@ -6830,7 +6824,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI QueryWrapper projectLibraryBaseQueryWrapper = new QueryWrapper<>(); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId); - Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); + Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); if (projectLibrayBaseCount > 0) { result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); if(result == -1){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 27329d286..ccba9111b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -25,7 +25,7 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl; import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper; import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; -import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService; +import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -122,7 +122,7 @@ import java.util.stream.Collectors; * @Version: V1.0 */ @Service -public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl implements IPlatformIProjectLibraryBaseService { +public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl implements IPlatformProjectLibraryBaseService { @Autowired private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;