ubcs.git - Gitblit

ludc

2023-04-07 747147c27d09209d3c6e237f981da045cca6c532

提交code服务部署报错修改

已修改11个文件

	Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/pom.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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 {

    /**
     * 序列化

 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;

}

 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>

 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));
    }


 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;

}

 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);


}

 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);

}

 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);
    }


 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("编码规则已生成编码，不允许删除");
        }

 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;
    }

 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>

			@@ -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 {

			/**
			* 序列化

			@@ -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;

			}

			@@ -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>

			@@ -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));
			}

			@@ -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;

			}

			@@ -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);


			}

			@@ -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);

			}

			@@ -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);
			}

			@@ -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("编码规则已生成编码，不允许删除");
			}

			@@ -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;
			}

			@@ -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>