From 27c183164c271eba7c911339da3a496a1a66ef13 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 五月 2023 09:39:18 +0800
Subject: [PATCH] 修改类名
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseAttrService.java | 6 +-
/dev/null | 34 -----------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java | 30 +++++++-------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java | 5 +-
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseAttrWrapper.java | 14 +++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java | 10 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 2
9 files changed, 37 insertions(+), 70 deletions(-)
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index f69f844..cbb2ec6 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -41,7 +41,7 @@
* nacos dev 鍦板潃
*/
//String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- String NACOS_DEV_ADDR = "192.168.93.149:38848";
+ String NACOS_DEV_ADDR = "192.168.93.190:38848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java
deleted file mode 100644
index da162b4..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodePhaseattrVO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 搴勯獮 (smallchill@163.com)
- */
-package com.vci.ubcs.code.vo;
-
-import com.vci.ubcs.code.entity.CodePhaseAttr;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 瑙嗗浘瀹炰綋绫�
- *
- * @author yuxc
- * @since 2023-04-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class CodePhaseattrVO extends CodePhaseAttr {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
index 7e0516f..e7d5218 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
@@ -21,9 +21,9 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
-import com.vci.ubcs.code.service.ICodePhaseattrService;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
-import com.vci.ubcs.code.wrapper.CodePhaseattrWrapper;
+import com.vci.ubcs.code.service.ICodePhaseAttrService;
+import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
+import com.vci.ubcs.code.wrapper.CodePhaseAttrWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -49,7 +49,7 @@
@Api(value = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴��", tags = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�ф帴鍙�")
public class CodePhaseattrController extends BladeController {
- private final ICodePhaseattrService CodePhaseattrService;
+ private final ICodePhaseAttrService codePhaseattrService;
private CodePhaseAttrMapper codePhaseAttrMapper;
@@ -59,9 +59,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆CodePhaseattr")
- public R<CodePhaseattrVO> detail(CodePhaseAttr codePhaseattr) {
- CodePhaseAttr detail = CodePhaseattrService.getOne(Condition.getQueryWrapper(codePhaseattr));
- return R.data(CodePhaseattrWrapper.build().entityVO(detail));
+ public R<CodePhaseAttrVO> detail(CodePhaseAttr codePhaseattr) {
+ CodePhaseAttr detail = codePhaseattrService.getOne(Condition.getQueryWrapper(codePhaseattr));
+ return R.data(CodePhaseAttrWrapper.build().entityVO(detail));
}
/**
* 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 鍒嗛〉
@@ -69,9 +69,9 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodePhaseattr")
- public R<IPage<CodePhaseattrVO>> list(CodePhaseAttr codePhaseattr, Query query) {
- IPage<CodePhaseAttr> pages = CodePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(codePhaseattr));
- return R.data(CodePhaseattrWrapper.build().pageVO(pages));
+ public R<IPage<CodePhaseAttrVO>> list(CodePhaseAttr codePhaseattr, Query query) {
+ IPage<CodePhaseAttr> pages = codePhaseattrService.page(Condition.getPage(query), Condition.getQueryWrapper(codePhaseattr));
+ return R.data(CodePhaseAttrWrapper.build().pageVO(pages));
}
/**
@@ -80,8 +80,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodePhaseattr")
- public R<IPage<CodePhaseattrVO>> page(CodePhaseattrVO CodePhaseattr, Query query) {
- IPage<CodePhaseattrVO> pages = CodePhaseattrService.selectCodePhaseattrPage(Condition.getPage(query), CodePhaseattr);
+ public R<IPage<CodePhaseAttrVO>> page(CodePhaseAttrVO codePhaseAttr, Query query) {
+ IPage<CodePhaseAttrVO> pages = codePhaseattrService.selectCodePhaseattrPage(Condition.getPage(query), codePhaseAttr);
return R.data(pages);
}
@@ -92,7 +92,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆CodePhaseattr")
public R save(@Valid @RequestBody CodePhaseAttr codePhaseattr) {
- return R.status(CodePhaseattrService.save(codePhaseattr));
+ return R.status(codePhaseattrService.save(codePhaseattr));
}
/**
@@ -102,7 +102,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆CodePhaseattr")
public R update(@Valid @RequestBody CodePhaseAttr codePhaseattr) {
- return R.status(CodePhaseattrService.updateById(codePhaseattr));
+ return R.status(codePhaseattrService.updateById(codePhaseattr));
}
/**
@@ -112,7 +112,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodePhaseattr")
public R submit(@Valid @RequestBody CodePhaseAttr codePhaseattr) {
- return R.status(CodePhaseattrService.saveOrUpdate(codePhaseattr));
+ return R.status(codePhaseattrService.saveOrUpdate(codePhaseattr));
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
index 5c430d9..070604d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
@@ -17,9 +17,10 @@
package com.vci.ubcs.code.mapper;
import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
+
import java.util.List;
/**
@@ -37,7 +38,7 @@
* @param CodePhaseattr
* @return
*/
- List<CodePhaseattrVO> selectCodePhaseattrPage(IPage page, CodePhaseattrVO CodePhaseattr);
+ List<CodePhaseAttrVO> selectCodePhaseattrPage(IPage page, CodePhaseAttrVO CodePhaseattr);
List<CodePhaseAttr> selectByPhasea(String oid);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseAttrService.java
similarity index 84%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseAttrService.java
index 167d9b6..6c87bb1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseattrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodePhaseAttrService.java
@@ -19,7 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
+import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
/**
* 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 鏈嶅姟绫�
@@ -27,7 +27,7 @@
* @author yuxc
* @since 2023-04-20
*/
-public interface ICodePhaseattrService extends IService<CodePhaseAttr> {
+public interface ICodePhaseAttrService extends IService<CodePhaseAttr> {
/**
* 鑷畾涔夊垎椤�
@@ -36,7 +36,7 @@
* @param CodePhaseattr
* @return
*/
- IPage<CodePhaseattrVO> selectCodePhaseattrPage(IPage<CodePhaseattrVO> page, CodePhaseattrVO CodePhaseattr);
+ IPage<CodePhaseAttrVO> selectCodePhaseattrPage(IPage<CodePhaseAttrVO> page, CodePhaseAttrVO CodePhaseattr);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index cdc0416..dfba31d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -102,7 +102,7 @@
@Autowired(required = false)
private CodeClstemplateMapper codeClstemplateMapper;
@Autowired(required = false)
- private CodePhaseattrServiceImpl codePhaseattrServiceImpl;
+ private CodePhaseAttrServiceImpl codePhaseattrServiceImpl;
@Override
public IPage<CodeClstemplateVO> selectPlCodeClstemplatePage(IPage<CodeClstemplateVO> page, CodeClstemplateVO plCodeClstemplate) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java
similarity index 78%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java
index 06962aa..5fc292e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java
@@ -20,8 +20,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodePhaseAttr;
import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
-import com.vci.ubcs.code.service.ICodePhaseattrService;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
+import com.vci.ubcs.code.service.ICodePhaseAttrService;
+import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
import org.springframework.stereotype.Service;
/**
@@ -31,11 +31,11 @@
* @since 2023-04-20
*/
@Service
-public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseAttrMapper, CodePhaseAttr> implements ICodePhaseattrService {
+public class CodePhaseAttrServiceImpl extends ServiceImpl<CodePhaseAttrMapper, CodePhaseAttr> implements ICodePhaseAttrService {
@Override
- public IPage<CodePhaseattrVO> selectCodePhaseattrPage(IPage<CodePhaseattrVO> page, CodePhaseattrVO CodePhaseattr) {
- return page.setRecords(baseMapper.selectCodePhaseattrPage(page, CodePhaseattr));
+ public IPage<CodePhaseAttrVO> selectCodePhaseattrPage(IPage<CodePhaseAttrVO> page, CodePhaseAttrVO codePhaseAttr) {
+ return page.setRecords(baseMapper.selectCodePhaseattrPage(page, codePhaseAttr));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
index ee9e092..e453456 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
@@ -31,7 +31,7 @@
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
-import com.vci.ubcs.code.service.ICodePhaseattrService;
+import com.vci.ubcs.code.service.ICodePhaseAttrService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
import com.vci.ubcs.code.wrapper.CodeTemplatePhaseWapper;
@@ -77,7 +77,7 @@
private CommonsMapper commonsMapper;
@Autowired(required = false)
- private ICodePhaseattrService codePhaseattrService;
+ private ICodePhaseAttrService codePhaseattrService;
/**
* 瀵硅薄鐨勬搷浣�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseAttrWrapper.java
similarity index 77%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseAttrWrapper.java
index 69343f4..623c0ed 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseattrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodePhaseAttrWrapper.java
@@ -17,9 +17,9 @@
package com.vci.ubcs.code.wrapper;
import com.vci.ubcs.code.entity.CodePhaseAttr;
+import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import com.vci.ubcs.code.vo.CodePhaseattrVO;
import java.util.Objects;
/**
@@ -28,22 +28,22 @@
* @author yuxc
* @since 2023-04-20
*/
-public class CodePhaseattrWrapper extends BaseEntityWrapper<CodePhaseAttr, CodePhaseattrVO> {
+public class CodePhaseAttrWrapper extends BaseEntityWrapper<CodePhaseAttr, CodePhaseAttrVO> {
- public static CodePhaseattrWrapper build() {
- return new CodePhaseattrWrapper();
+ public static CodePhaseAttrWrapper build() {
+ return new CodePhaseAttrWrapper();
}
@Override
- public CodePhaseattrVO entityVO(CodePhaseAttr codePhaseattr) {
- CodePhaseattrVO CodePhaseattrVO = Objects.requireNonNull(BeanUtil.copy(codePhaseattr, CodePhaseattrVO.class));
+ public CodePhaseAttrVO entityVO(CodePhaseAttr codePhaseattr) {
+ CodePhaseAttrVO codePhaseAttrVO = Objects.requireNonNull(BeanUtil.copy(codePhaseattr, CodePhaseAttrVO.class));
//User createUser = UserCache.getUser(CodePhaseattr.getCreateUser());
//User updateUser = UserCache.getUser(CodePhaseattr.getUpdateUser());
//CodePhaseattrVO.setCreateUserName(createUser.getName());
//CodePhaseattrVO.setUpdateUserName(updateUser.getName());
- return CodePhaseattrVO;
+ return codePhaseAttrVO;
}
--
Gitblit v1.9.3