From 747147c27d09209d3c6e237f981da045cca6c532 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 四月 2023 20:31:22 +0800
Subject: [PATCH] 提交code服务部署报错修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java | 16 ++++----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java | 3 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java | 19 +++++----
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml | 6 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 6 ---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java | 22 +++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java | 10 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java | 10 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 4 +-
11 files changed, 49 insertions(+), 55 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java
index ad6e131..63d4b5f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java
@@ -31,9 +31,9 @@
*/
@Data
@TableName("PL_CODE_ALLCODE")
-@ApiModel(value = "CodeAllcode瀵硅薄", description = "鍏ㄩ儴鐮佸��")
+@ApiModel(value = "CodeAllCode瀵硅薄", description = "鍏ㄩ儴鐮佸��")
@EqualsAndHashCode(callSuper = true)
-public class CodeAllcode extends BaseModel {
+public class CodeAllCode extends BaseModel {
/**
* 搴忓垪鍖�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java
index 818ad09..3d82a60 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java
@@ -16,7 +16,6 @@
*/
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,7 +27,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class CodeAllcodeVO extends BaseModelVO {
+public class CodeAllCodeVO extends BaseModelVO {
private static final long serialVersionUID = 1L;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 442bb47..e3e43c8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,12 +16,6 @@
<modelVersion>4.0.0</modelVersion>
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <axis2.version>1.7.9</axis2.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.vci.ubcs</groupId>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java
index 81c307d..10651a9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java
@@ -18,9 +18,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.service.ICodeAllcodeService;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import com.vci.ubcs.code.wrapper.CodeAllcodeWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -55,8 +55,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆CodeAllcode")
- public R<CodeAllcodeVO> detail(CodeAllcode CodeAllcode) {
- CodeAllcode detail = CodeAllcodeService.getOne(Condition.getQueryWrapper(CodeAllcode));
+ public R<CodeAllCodeVO> detail(CodeAllCode CodeAllcode) {
+ CodeAllCode detail = CodeAllcodeService.getOne(Condition.getQueryWrapper(CodeAllcode));
return R.data(CodeAllcodeWrapper.build().entityVO(detail));
}
/**
@@ -65,8 +65,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeAllcode")
- public R<IPage<CodeAllcodeVO>> list(CodeAllcode CodeAllcode, Query query) {
- IPage<CodeAllcode> pages = CodeAllcodeService.page(Condition.getPage(query), Condition.getQueryWrapper(CodeAllcode));
+ public R<IPage<CodeAllCodeVO>> list(CodeAllCode CodeAllcode, Query query) {
+ IPage<CodeAllCode> pages = CodeAllcodeService.page(Condition.getPage(query), Condition.getQueryWrapper(CodeAllcode));
return R.data(CodeAllcodeWrapper.build().pageVO(pages));
}
@@ -76,8 +76,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeAllcode")
- public R<IPage<CodeAllcodeVO>> page(CodeAllcodeVO CodeAllcode, Query query) {
- IPage<CodeAllcodeVO> pages = CodeAllcodeService.selectCodeAllcodePage(Condition.getPage(query), CodeAllcode);
+ public R<IPage<CodeAllCodeVO>> page(CodeAllCodeVO CodeAllcode, Query query) {
+ IPage<CodeAllCodeVO> pages = CodeAllcodeService.selectCodeAllcodePage(Condition.getPage(query), CodeAllcode);
return R.data(pages);
}
@@ -87,7 +87,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鏂板", notes = "浼犲叆CodeAllcode")
- public R save(@Valid @RequestBody CodeAllcode codeAllcode) {
+ public R save(@Valid @RequestBody CodeAllCode codeAllcode) {
return R.status(CodeAllcodeService.save(codeAllcode));
}
@@ -97,7 +97,7 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆CodeAllcode")
- public R update(@Valid @RequestBody CodeAllcode codeAllcode) {
+ public R update(@Valid @RequestBody CodeAllCode codeAllcode) {
return R.status(CodeAllcodeService.updateById(codeAllcode));
}
@@ -107,7 +107,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodeAllcode")
- public R submit(@Valid @RequestBody CodeAllcode codeAllcode) {
+ public R submit(@Valid @RequestBody CodeAllCode codeAllcode) {
return R.status(CodeAllcodeService.saveOrUpdate(codeAllcode));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java
index 766625a..4a775a4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java
@@ -16,7 +16,7 @@
*/
package com.vci.ubcs.code.dto;
-import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.entity.CodeAllCode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,7 +28,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class CodeCodeAllcodeDTO extends CodeAllcode {
+public class CodeCodeAllcodeDTO extends CodeAllCode {
private static final long serialVersionUID = 1L;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
index b92ce23..991bea3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
@@ -18,8 +18,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.code.entity.CodeAllcode;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.entity.CodeAllCode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import java.util.List;
@@ -29,16 +29,16 @@
* @author ludc
* @since 2023-04-03
*/
-public interface CodeAllcodeMapper extends BaseMapper<CodeAllcode> {
+public interface CodeAllCodeMapper extends BaseMapper<CodeAllCode> {
/**
* 鑷畾涔夊垎椤�
*
* @param page
- * @param CodeAllcode
+ * @param codeAllCode
* @return
*/
- List<CodeAllcodeVO> selectCodeAllcodePage(IPage page, CodeAllcodeVO CodeAllcode);
+ List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java
index 61353f5..a6ff229 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java
@@ -19,8 +19,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeAllcode;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.entity.CodeAllCode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import java.util.List;
@@ -30,7 +30,7 @@
* @author ludc
* @since 2023-04-03
*/
-public interface ICodeAllcodeService extends IService<CodeAllcode> {
+public interface ICodeAllcodeService extends IService<CodeAllCode> {
/**
* 鑷畾涔夊垎椤�
@@ -39,13 +39,13 @@
* @param CodeAllcode
* @return
*/
- IPage<CodeAllcodeVO> selectCodeAllcodePage(IPage<CodeAllcodeVO> page, CodeAllcodeVO CodeAllcode);
+ IPage<CodeAllCodeVO> selectCodeAllcodePage(IPage<CodeAllCodeVO> page, CodeAllCodeVO CodeAllcode);
/**
* 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
* @param wrapper 鏌ヨ灏佽鍣�
* @return 鏁版嵁瀵硅薄
*/
- List<CodeAllcode> selectByWrapper(Wrapper wrapper);
+ List<CodeAllCode> selectByWrapper(Wrapper wrapper);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java
index 9048d7e..7446f59 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java
@@ -19,10 +19,10 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeAllcode;
-import com.vci.ubcs.code.mapper.CodeAllcodeMapper;
+import com.vci.ubcs.code.entity.CodeAllCode;
+import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.service.ICodeAllcodeService;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,17 +35,17 @@
* @since 2023-04-03
*/
@Service
-public class CodeAllcodeServiceImpl extends ServiceImpl<CodeAllcodeMapper, CodeAllcode> implements ICodeAllcodeService {
+public class CodeAllcodeServiceImpl extends ServiceImpl<CodeAllCodeMapper, CodeAllCode> implements ICodeAllcodeService {
/**
* 鏁版嵁鎿嶄綔瀵硅薄
*/
@Resource
- private CodeAllcodeMapper codeAllcodeMapper;
+ private CodeAllCodeMapper codeAllcodeMapper;
@Override
- public IPage<CodeAllcodeVO> selectCodeAllcodePage(IPage<CodeAllcodeVO> page, CodeAllcodeVO CodeAllcode) {
- return page.setRecords(baseMapper.selectCodeAllcodePage(page, CodeAllcode));
+ public IPage<CodeAllCodeVO> selectCodeAllcodePage(IPage<CodeAllCodeVO> page, CodeAllCodeVO CodeAllcode) {
+ return page.setRecords(baseMapper.selectCodeAllCodePage(page, CodeAllcode));
}
/**
@@ -54,7 +54,7 @@
* @return 鏁版嵁瀵硅薄
*/
@Override
- public List<CodeAllcode> selectByWrapper(Wrapper wrapper) {
+ public List<CodeAllCode> selectByWrapper(Wrapper wrapper) {
return this.codeAllcodeMapper.selectList(wrapper);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 90c590b..0366b45 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -21,7 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeRuleDTO;
-import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
@@ -183,7 +183,7 @@
}
}
- List<CodeAllcode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllcode>query().eq("codeRuleOid", codeRuleDTO.getOid()));
+ List<CodeAllCode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllCode>query().eq("codeRuleOid", codeRuleDTO.getOid()));
if (!CollectionUtils.isEmpty(codeDOList)) {
return R.fail("缂栫爜瑙勫垯宸茬敓鎴愮紪鐮侊紝涓嶅厑璁稿垹闄�");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java
index 050ac0f..bb5d40c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java
@@ -16,10 +16,11 @@
*/
package com.vci.ubcs.code.wrapper;
+import com.vci.ubcs.code.entity.CodeAllCode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import com.vci.ubcs.code.entity.CodeAllcode;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+
import java.util.Objects;
/**
@@ -28,20 +29,20 @@
* @author ludc
* @since 2023-04-03
*/
-public class CodeAllcodeWrapper extends BaseEntityWrapper<CodeAllcode, CodeAllcodeVO> {
+public class CodeAllcodeWrapper extends BaseEntityWrapper<CodeAllCode, CodeAllCodeVO> {
public static CodeAllcodeWrapper build() {
return new CodeAllcodeWrapper();
}
@Override
- public CodeAllcodeVO entityVO(CodeAllcode CodeAllcode) {
- CodeAllcodeVO CodeAllcodeVO = Objects.requireNonNull(BeanUtil.copy(CodeAllcode, CodeAllcodeVO.class));
+ public CodeAllCodeVO entityVO(CodeAllCode CodeAllcode) {
+ CodeAllCodeVO CodeAllcodeVO = Objects.requireNonNull(BeanUtil.copy(CodeAllcode, CodeAllCodeVO.class));
- //User createUser = UserCache.getUser(CodeAllcode.getCreateUser());
- //User updateUser = UserCache.getUser(CodeAllcode.getUpdateUser());
- //CodeAllcodeVO.setCreateUserName(createUser.getName());
- //CodeAllcodeVO.setUpdateUserName(updateUser.getName());
+ //User createUser = UserCache.getUser(CodeAllCode.getCreateUser());
+ //User updateUser = UserCache.getUser(CodeAllCode.getUpdateUser());
+ //CodeAllCodeVO.setCreateUserName(createUser.getName());
+ //CodeAllCodeVO.setUpdateUserName(updateUser.getName());
return CodeAllcodeVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
index e656cac..db6b406 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeAllcodeMapper">
+<mapper namespace="com.vci.ubcs.code.mapper.CodeAllCodeMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="CodeAllcodeResultMap" type="com.vci.ubcs.code.entity.CodeAllcode">
+ <resultMap id="CodeAllcodeResultMap" type="com.vci.ubcs.code.entity.CodeAllCode">
</resultMap>
- <select id="selectCodeAllcodePage" resultMap="CodeAllcodeResultMap">
+ <select id="selectCodeAllCodePage" resultMap="CodeAllcodeResultMap">
select * from PL_CODE_ALLCODE
</select>
--
Gitblit v1.9.3