版本规则管理所有接口上传（已测试待联调）

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java

@@ -64,7 +64,6 @@
     */
    private Date ts;


    /**
     * åˆ›å»ºäºº
     */

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsRevisionRulePO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
package com.vci.po;

import com.vci.starter.poi.annotation.ExcelColumn;
import com.vci.starter.web.pagemodel.BaseModelVO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
 * å±žæ€§æ± å¯¼å…¥å¯¹è±¡
 * @author ludc
 * @date 2024/7/19 11:11
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class OsRevisionRulePO extends BaseModelVO {

    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = -2239512786206928201L;

    /**
     * æ‰€åœ¨æ•°æ®è¡Œ
     */
    @ExcelColumn(rowIndexColumn = true,value = "")
    private String rowIndex;

    /**
     * å±žæ€§è‹±æ–‡åç§°
     */
    @ExcelColumn(value="名称",nullable = false)
    private String id;

    /**
     * æ ‡ç­¾
     */
    @ExcelColumn(value="标签")
    private String name;

    /**
     * è·³è·ƒå­—符
     */
    @ExcelColumn(value="跳跃字符")
    private String jumpCharacter;

    /**
     * åˆå§‹å€¼
     */
    @ExcelColumn(value="初始值",nullable = false)
    private String initialValue;

    /**
     * æ­¥é•¿
     */
    @ExcelColumn(value="步长",nullable = false)
    private String stepLength;

    /**
     * å‰ç¼€
     */
    @ExcelColumn(value="前缀")
    private String prefixion;

    /**
     * åŽç¼€
     */
    @ExcelColumn(value="后缀")
    private String suffix;

    /**
     * æè¿°
     */
    @ExcelColumn(value="描述")
    private String description;

}

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsStatusPO.java

@@ -7,7 +7,7 @@
import lombok.NoArgsConstructor;

/**
 * å±žæ€§æ± å¯¼å…¥å¯¹è±¡
 * çŠ¶æ€æ± å¯¼å…¥å¯¹è±¡
 * @author ludc
 * @date 2024/7/19 11:11
 */
@@ -42,8 +42,8 @@
    /**
     * å±žæ€§ç±»åž‹
     */
    @ExcelColumn(value="图片(路径)")
    private String imagePath;
    //@ExcelColumn(value="图片(路径)")
    //private String imagePath;

    /**
     * æè¿°

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java

@@ -1,15 +1,29 @@
package com.vci.web.controller;

import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.dto.OsRevisionRuleDTO;
import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsRevisionRuleServiceI;
import com.vci.web.util.Func;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.List;

/**
 * ç‰ˆæœ¬è§„则控制器
@@ -33,7 +47,6 @@
     * @return
     */
    @GetMapping("/getVersionRuleAllList")
    @VciUnCheckRight
    public BaseResult getVersionRuleAllList(){
        try {
            return BaseResult.dataList(revisionRuleServiceI.selectAllRevision());
@@ -51,7 +64,6 @@
     * @return
     */
    @GetMapping("/getUsedVersionRuleList")
    @VciUnCheckRight
    public BaseResult getUsedVersionRuleList(String vrName){
        try {
            return BaseResult.dataList(revisionRuleServiceI.getUsedVersionRuleList(vrName));
@@ -69,7 +81,6 @@
     * @return
     */
    @PostMapping("/addVersionRule")
    @VciUnCheckRight
    public BaseResult addVersionRule(@RequestBody OsRevisionRuleDTO osRevisionRuleDTO){
        try {
            return revisionRuleServiceI.addVersionRule(osRevisionRuleDTO) ? BaseResult.success("版本规则添加成功！"):BaseResult.fail("版本规则添加失败！");
@@ -86,17 +97,104 @@
     * @param osRevisionRuleDTO ç‰ˆæœ¬è§„则数据传输对象
     * @return
     */
    @PostMapping("/updateVersionRule")
    @VciUnCheckRight
    @PutMapping("/updateVersionRule")
    public BaseResult updateVersionRule(@RequestBody OsRevisionRuleDTO osRevisionRuleDTO){
        try {
            return revisionRuleServiceI.updateVersionRule(osRevisionRuleDTO) ? BaseResult.success("版本规则添加成功！"):BaseResult.fail("版本规则添加失败！");
            return revisionRuleServiceI.updateVersionRule(osRevisionRuleDTO) ? BaseResult.success("版本规则修改成功！"):BaseResult.fail("版本规则修改失败！");
        }catch (Exception e) {
            e.printStackTrace();
            String exceptionMessage = "增加属性时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            String exceptionMessage = "修改版本规则时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

    /**
     * åˆ é™¤ç‰ˆæœ¬è§„则
     * @param osRevisionRuleDTOS ç‰ˆæœ¬è§„则数据传输对象
     * @return
     */
    @DeleteMapping("/deleteVersionRule")
    public BaseResult deleteVersionRule(@RequestBody List<OsRevisionRuleDTO> osRevisionRuleDTOS){
        try {
            return revisionRuleServiceI.deleteVersionRule(osRevisionRuleDTOS) ? BaseResult.success("版本规则删除成功！"):BaseResult.fail("版本规则删除失败！");
        }catch (Exception e) {
            e.printStackTrace();
            String exceptionMessage = "删除版本规则时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }

    /**
     * å¯¼å‡ºé€‰ä¸­çš„版本规则
     * @param exportFileName å¯¼å‡ºçš„文件名
     * @param vrNames éœ€è¦å¯¼å‡ºçš„规则英文名称
     * @param response
     */
    @GetMapping( "/exportVersionRule")
    @VciBusinessLog(operateName = "导出版本规则")
    public void exportVersionRule(String exportFileName,String vrNames, HttpServletResponse response){
        try {
            String excelPath = revisionRuleServiceI.exportVersionRule(exportFileName,vrNames,false);
            ControllerUtil.writeFileToResponse(response,excelPath);
        } catch (Exception e) {
            String msg = "导出版本规则时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            try {
                //出错时
                e.printStackTrace();
                ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
            } catch (IOException ioException) {
                ioException.printStackTrace();
            }
        }
    }

    /**
     * ä¸‹è½½ç‰ˆæœ¬è§„则导入模板
     * @param exportFileName
     * @param response
     */
    @GetMapping( "/downloadAttributeTemplate")
    @VciBusinessLog(operateName = "导出版本规则")
    public void downloadVersionRuleTemplate(String exportFileName, HttpServletResponse response){
        try {
            String excelPath = revisionRuleServiceI.downloadVersionRuleTemplate(exportFileName);
            ControllerUtil.writeFileToResponse(response,excelPath);
        } catch (Exception e) {
            String msg = "下载版本规则导入模板时出现错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            try {
                //出错时
                e.printStackTrace();
                ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
            } catch (IOException ioException) {
                ioException.printStackTrace();
            }
        }
    }

    /**
     * å¯¼å…¥ç‰ˆæœ¬è§„则
     * @param file
     * @return
     */
    @PostMapping("/importVersionRules")
    @VciBusinessLog(operateName = "导入版本规则")
    public BaseResult importVersionRules(MultipartFile file){
        String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
        File file1 = new File(excelFileName);
        try {
            file.transferTo(new File(excelFileName));
            if (file != null) {
                return revisionRuleServiceI.importVersionRules(file1);
            } else {
                return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"无导入的文件"});
            }
        }catch (Throwable e) {
            throw new VciBaseException(VciBaseUtil.getExceptionMessage(e),new String[0],e);
        }finally {
            file1.delete();
        }
    }

}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java

@@ -4,7 +4,9 @@
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.dto.OsRevisionRuleDTO;
import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.starter.web.pagemodel.BaseResult;

import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -43,6 +45,13 @@
    boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException;

    /**
     * åˆ é™¤ç‰ˆæœ¬è§„则
     * @param osRevisionRuleDTOS
     * @return
     */
    boolean deleteVersionRule(List<OsRevisionRuleDTO> osRevisionRuleDTOS) throws PLException;

    /**
     * æ•°æ®å¯¹è±¡è½¬æ¢ä¸ºæ˜¾ç¤ºå¯¹è±¡
     * @param versionRules æ•°æ®å¯¹è±¡
     * @return æ˜¾ç¤ºå¯¹è±¡
@@ -64,10 +73,41 @@
    OsRevisionRuleVO getRevisionRuleById(String id);

    /**
     * ä½¿ç”¨å¤šä¸ªç¼–号获取规则的值
     * @param vrIdList ç¼–号
     * @return æ˜¾ç¤ºå¯¹è±¡
     */
    List<OsRevisionRuleVO> getRevisionRuleByIds(Collection<String> vrIdList);

    /**
     * æŸ¥è¯¢åº”用范围
     * @param vrName ç‰ˆæœ¬è§„则英文名称
     * @return
     */
    List<Map<String, String>> getUsedVersionRuleList(String vrName) throws PLException;

    /**
     * å¯¼å‡ºé€‰ä¸­çš„版本规则
     * @param exportFileName å¯¼å‡ºçš„文件名
     * @param vrNames éœ€è¦å¯¼å‡ºçš„版本规则名称
     * @param flag æŽ§åˆ¶å¯¼å‡ºçš„列名是否和导入模板一致
     * @return
     */
    String exportVersionRule(String exportFileName,String vrNames,boolean flag/*控制导出的列名是否和导入模板一致*/) throws PLException;

    /**
     * ä¸‹è½½ç‰ˆæœ¬è§„则导入模板
     * @param exportFileName
     * @return
     * @throws PLException
     */
    String downloadVersionRuleTemplate(String exportFileName) throws Exception;

    /**
     * å¯¼å…¥ç‰ˆæœ¬è§„则
     * @param file
     * @return
     */
    BaseResult importVersionRules(File file) throws Exception;

}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java

@@ -481,8 +481,7 @@
        checkName(osAttributeDTO.getId());
        //检查默认值与属性类型是否匹配
        checkDefValue(osAttributeDTO);
        //dto对象转换为存储所需对象
        osAttributeDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
        //osAttributeDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
        AttributeDef attributeDef = this.osAttributeDTO2AttributeDef(osAttributeDTO);
        return platformClientUtil.getAttributeService().addAttributeDef(attributeDef);
    }
@@ -695,7 +694,7 @@
        }
        //检查属性名是否已存在与系统中
        if(platformClientUtil.getAttributeService().checkRowIsExists(abName)){
            throw new PLException("500",new String[]{"属性名称在系统中已存在!"});
            throw new PLException("500",new String[]{"属性名称【" + abName + "】在系统中已存在!"});
        }
    }

@@ -890,8 +889,8 @@
            excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
        }
        //按照属性名查询属性，然后处理属性导出
        List<String> enumNameList = Func.toStrList(attrNames);
        List<OsAttributeVO> osAttributeVOS = this.listAttrByIds(enumNameList);
        List<String> attrameList = Func.toStrList(attrNames);
        List<OsAttributeVO> osAttributeVOS = this.listAttrByIds(attrameList);
        if(Func.isEmpty(osAttributeVOS)){
            excelDataList.add(new WriteExcelData(1,1, "根据属性名称未查询到属性信息，请刷新后尝试重新导出！"));
        }else{
@@ -1018,10 +1017,9 @@
            List<OsAttributeDTO> dtoList = new ArrayList<>();
            //当前excel中是否重复用的判重Map:（key：判重属性，value：行号）
            Map<String, String> excelReapeat = new HashMap<>();
            //判断必填属性是否为空，用户是否已存在，以及部门是否填错等校验逻辑
            poList.stream().forEach(osAttributePO -> {
                if(Func.isBlank(osAttributePO.getId())){//属性名判空
                    throw new VciBaseException("第【"+osAttributePO.getRowIndex()+"】行，enumnameerror");
                    throw new VciBaseException("第【"+osAttributePO.getRowIndex()+"】行，attrnameerror");
                }else if(Func.isBlank(osAttributePO.getAttributeDataType())){
                    throw new VciBaseException("第【"+osAttributePO.getRowIndex()+"】行，typeerror");
                }else if(excelReapeat.containsKey(osAttributePO.getId())){//属性名表格中判重
@@ -1037,7 +1035,7 @@
                //属性名excel中判重处理
                excelReapeat.put(osAttributePO.getId(),osAttributePO.getRowIndex());
                OsAttributeDTO osAttributeDTO = new OsAttributeDTO();
                //查询枚举是否存在，填写了枚举但没填写取值范围，这时候直接使用枚举项值作为默认的range
                //查询属性是否存在，填写了枚举但没填写取值范围，这时候直接使用枚举项值作为默认的range
                if(Func.isNotBlank(osAttributePO.getEnumId()) && Func.isBlank(osAttributePO.getRange())){
                    try {
                        OsEnumVO enumVO = enumService.getEnumTypeById(osAttributePO.getEnumId());
@@ -1075,7 +1073,7 @@
                    checkDefValue(osAttributeDTO);
                } catch (PLException e) {
                    e.printStackTrace();
                    throw new VciBaseException(e.getMessage());
                    throw new VciBaseException(VciBaseUtil.getExceptionMessage(e));
                }
                dtoList.add(osAttributeDTO);
            });
@@ -1098,7 +1096,7 @@
            e.printStackTrace();
            return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
        }
        return BaseResult.success("枚举导入成功！");
        return BaseResult.success("属性导入成功！");
    }

    /**

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java

@@ -605,7 +605,7 @@
            }
            //当前excel中是否重复用的判重Map:（key：判重属性，value：行号）
            Map<String, String> excelReapeat = new HashMap<>();
            //判断必填属性是否为空，用户是否已存在，以及部门是否填错等校验逻辑
            //判断必填属性是否为空等等
            List<String> finalRepeatEnumId = repeatEnumId;
            newPOList.stream().forEach(osEnumPO -> {
                if(Func.isBlank(osEnumPO.getId())){//枚举名
@@ -618,7 +618,7 @@
                    throw new VciBaseException("第【"+osEnumPO.getRowIndex()+"】行数据，枚举名称只能为英文字母");
                }else if(excelReapeat.containsKey(osEnumPO.getId())){//枚举名表格中判重
                    throw new VciBaseException("第【"+excelReapeat.get(osEnumPO.getId())+"】行和第【"+osEnumPO.getRowIndex()+"】行数据，枚举名重复");
                }else if (Func.isNotEmpty(osEnumVOList) && finalRepeatEnumId.contains(osEnumPO.getId())){//2、判断枚举名是否与系统中重复
                }else if (Func.isNotEmpty(finalRepeatEnumId) && finalRepeatEnumId.contains(osEnumPO.getId())){//2、判断枚举名是否与系统中重复
                    throw new VciBaseException("第【"+osEnumPO.getRowIndex()+"】行，枚举名在系统中已经存在,请修改!");
                }
                //先对枚举名excel中需要判重处理
@@ -697,7 +697,7 @@
     */
    private EnumType osEnumDTO2EnumType(OsEnumDTO osEnumDTO){
        EnumType enumType = new EnumType();
        enumType.oid = osEnumDTO.getOid();
        //enumType.oid = osEnumDTO.getOid();
        //枚举名统一转成小写，避免后期出现其他问题
        enumType.name = osEnumDTO.getId().toLowerCase(Locale.ROOT);
        enumType.label = osEnumDTO.getName();

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java

@@ -2,24 +2,43 @@

import com.vci.client.mw.ClientSessionUtility;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.stm.StatePool;
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.dto.OsAttributeDTO;
import com.vci.dto.OsRevisionRuleDTO;
import com.vci.dto.OsStatusDTO;
import com.vci.pagemodel.OsAttributeVO;
import com.vci.pagemodel.OsEnumVO;
import com.vci.pagemodel.OsStatusVO;
import com.vci.po.OsAttributePO;
import com.vci.po.OsEnumPO;
import com.vci.po.OsRevisionRulePO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.constant.ExcelLangCodeConstant;
import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.*;
import com.vci.pagemodel.OsRevisionRuleVO;
import com.vci.starter.web.util.WebThreadLocalUtil;
import com.vci.web.service.OsRevisionRuleServiceI;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -44,6 +63,16 @@
    @Autowired(required = false)
    @Lazy
    private OsRevisionRuleServiceI self;

    /**
     * æ—¥å¿—
     */
    private Logger logger = LoggerFactory.getLogger(getClass());

    /**
     *  å¿…填列
     */
    private List<Integer> ColumnNameisRed = new ArrayList<Integer>();

    /**
     * æŸ¥è¯¢æ‰€æœ‰çš„版本规则
@@ -82,7 +111,7 @@
        //版本规则合规检验
        this.checkVersionRule(osRevisionRuleDTO);
        //查重
        VersionRule vr = platformClientUtil.getVersionService().getVersionRule(osRevisionRuleDTO.getName());
        VersionRule vr = platformClientUtil.getVersionService().getVersionRule(osRevisionRuleDTO.getId());
        //name不为空
        if(Func.isNotEmpty(vr) && !"".equals(vr.name)){
            throw new PLException("500",new String[]{"名称重复请更换名称!"});
@@ -108,6 +137,50 @@
            throw new PLException("500",new String[]{"修改的版本规则在系统中不存在!"});
        }
        return platformClientUtil.getVersionService().modifyVersionRule(this.dto2VersionRule(osRevisionRuleDTO));
    }

    /**
     * åˆ é™¤ç‰ˆæœ¬è§„则
     * @param osRevisionRuleDTOS
     * @return
     */
    @Override
    public boolean deleteVersionRule(List<OsRevisionRuleDTO> osRevisionRuleDTOS) throws PLException {
        VciBaseUtil.alertNotNull(osRevisionRuleDTOS,"待删除的属性列表");
        //判断要删除的版本规则是否有被引用
        osRevisionRuleDTOS.stream().forEach(item->{
            String vrName = item.getId();
            try {
                String[] btNamesByVerName = platformClientUtil.getBtmService().getBTNamesByVerName(vrName);
                if(btNamesByVerName != null && btNamesByVerName.length > 0){
                    throw new VciBaseException("该版本已被使用不允许删除");
                }
            } catch (PLException e) {
                logger.error(e.getMessage());
                e.printStackTrace();
                throw new VciBaseException(e.getMessage());
            }
        });

        //平台的deleteStatus方法必传三个参数，oid、name和ts
        List<VersionRule> vrList = new ArrayList<>();
        for(OsRevisionRuleDTO vrDTO : osRevisionRuleDTOS){
            //oid和ts判空
            String oid = vrDTO.getOid();
            //id主要用来对缓存数据删除
            String id = vrDTO.getId();
            //后台会用ts进行数据一致性校验
            Date ts = vrDTO.getTs();
            if(Func.isBlank(oid) || Func.isBlank(id) || Func.isEmpty(ts)){
                throw new PLException("500",new String[]{"待删除的状态列表中主键【oid】、调整时间【ts】、状态名称【name】不能为空！"});
            }
            VersionRule vr = new VersionRule();
            vr.oid = oid;
            vr.name = id;
            vr.ts = Func.format(ts,VciDateUtil.DateTimeMillFormat);
            vrList.add(vr);
        }
        return platformClientUtil.getVersionService().deleteVersionRules(vrList.toArray(new VersionRule[vrList.size()]));
    }

    /**
@@ -142,7 +215,7 @@
        if(Func.isNotBlank(dto.getPrefixion()) && (dto.getPrefixion().matches(regex3))){
            throw new PLException("500",new String[]{"前缀不能以空格开头"});
        }
        if (dto.getPrefixion().length() + dto.getPrefixion().length() > 32) {
        if (Func.isNotBlank(dto.getPrefixion()) && dto.getPrefixion().length() > 32) {
            throw new PLException("500",new String[]{"前缀不能超过32个字符"});
        }
        //后缀相关判断
@@ -150,7 +223,7 @@
        if(Func.isNotBlank(dto.getSuffix()) && (dto.getSuffix().matches(regex4))){
            throw new PLException("500",new String[]{"后缀不能以空格结尾"});
        }
        if (dto.getSuffix().length() + dto.getSuffix().length() > 32) {
        if (Func.isNotBlank(dto.getSuffix()) && dto.getSuffix().length() > 32) {
            throw new PLException("500",new String[]{"后缀不能超过32个字符"});
        }
        if (dto.getId().length() > 255) {
@@ -164,6 +237,7 @@
     */
    private VersionRule dto2VersionRule(OsRevisionRuleDTO osRevisionRuleDTO){
        VersionRule newVR = new VersionRule();
        newVR.oid = osRevisionRuleDTO.getOid();
        newVR.name = osRevisionRuleDTO.getId();
        newVR.tag = osRevisionRuleDTO.getName();
        newVR.description = osRevisionRuleDTO.getDescription();
@@ -172,8 +246,9 @@
        newVR.stepLength = osRevisionRuleDTO.getStepLength();
        newVR.prefixion = osRevisionRuleDTO.getPrefixion();
        newVR.suffix = osRevisionRuleDTO.getSuffix();
        String userName = "developer";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
        String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
        long timeMillis = System.currentTimeMillis();
        newVR.ts = Func.format((Func.isNotEmpty(osRevisionRuleDTO.getTs()) ? osRevisionRuleDTO.getTs():new Date()),VciDateUtil.DateTimeMillFormat);
        newVR.creator = Func.isBlank(osRevisionRuleDTO.getCreator()) ? userName:osRevisionRuleDTO.getCreator();
        newVR.createTime = Func.isEmpty(osRevisionRuleDTO.getCreateTime()) ? timeMillis:osRevisionRuleDTO.getCreateTime().getTime();
        newVR.modifier = userName;
@@ -213,7 +288,7 @@
            try {
                ruleVO.setCreateTime(VciDateUtil.long2Date(versionRule.createTime));
                ruleVO.setLastModifyTime(VciDateUtil.long2Date(versionRule.modifyTime));
                ruleVO.setTs(VciDateUtil.str2Date(versionRule.ts,VciDateUtil.DateTimeFormat));
                ruleVO.setTs(VciDateUtil.str2Date(versionRule.ts,VciDateUtil.DateTimeMillFormat));
            } catch (Exception e) {
                e.printStackTrace();
            }
@@ -245,6 +320,27 @@
    }

    /**
     * ä½¿ç”¨å¤šä¸ªç¼–号获取规则的值
     * @param vrIdList ç¼–号
     * @return æ˜¾ç¤ºå¯¹è±¡
     */
    @Override
    public List<OsRevisionRuleVO> getRevisionRuleByIds(Collection<String> vrIdList) {
        if(Func.isEmpty(vrIdList)){
            return null;
        }
        Map<String, OsRevisionRuleVO> revisionRuleVOMap = self.selectAllRevisionMap();
        List<OsRevisionRuleVO> versionRuleList = new ArrayList<>();
        vrIdList.stream().forEach(vrId->{
            OsRevisionRuleVO versionRuleVO = revisionRuleVOMap.getOrDefault(vrId.toLowerCase(Locale.ROOT),null);
            if(versionRuleVO!=null){
                versionRuleList.add(versionRuleVO);
            }
        });
        return versionRuleList;
    }

    /**
     * æŸ¥è¯¢åº”用范围
     * @param vrName ç‰ˆæœ¬è§„则英文名称
     * @return
@@ -269,6 +365,210 @@
    }

    /**
     * å¯¼å‡ºé€‰ä¸­çš„版本规则
     * @param exportFileName å¯¼å‡ºçš„文件名
     * @param vrNames éœ€è¦å¯¼å‡ºçš„版本规则名称
     * @param flag æŽ§åˆ¶å¯¼å‡ºçš„列名是否和导入模板一致
     * @return
     */
    @Override
    public String exportVersionRule(String exportFileName, String vrNames, boolean flag) throws PLException {
        if(Func.isBlank(vrNames)){
            throw new PLException("500",new String[]{"请勾选要导出的版本规则!"});
        }
        //界面没传名称，使用默认导出名称
        exportFileName = Func.isBlank(exportFileName) ?  "版本规则导出_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
        //设置列名
        List<String> columns = this.getCloumns(flag);

        //写excel
        String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
        try {
            new File(excelPath).createNewFile();
        } catch (Throwable e) {
            throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelPath}, e);
        }
        //设置列
        List<WriteExcelData> excelDataList = new ArrayList<>();
        //设置列头
        for (int index = 0; index < columns.size(); index++) {
            excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
        }
        //按照版本规则名查询，然后处理版本规则导出
        List<String> vrIdList = Func.toStrList(vrNames);
        List<OsRevisionRuleVO> revisionRuleVOList = this.getRevisionRuleByIds(vrIdList);
        if(Func.isEmpty(revisionRuleVOList)){
            excelDataList.add(new WriteExcelData(1,1, "根据名称未查询到版本规则信息，请刷新后尝试重新导出！"));
        }else{
            for (int i = 0; i < revisionRuleVOList.size(); i++) {
                OsRevisionRuleVO revisionRuleVO = revisionRuleVOList.get(i);
                excelDataList.add(new WriteExcelData(i+1,0, revisionRuleVO.getId()));
                excelDataList.add(new WriteExcelData(i+1,1, revisionRuleVO.getName()));
                excelDataList.add(new WriteExcelData(i+1,2, revisionRuleVO.getJumpCharacter()));
                excelDataList.add(new WriteExcelData(i+1,3, revisionRuleVO.getInitialValue()));
                excelDataList.add(new WriteExcelData(i+1,4, revisionRuleVO.getStepLength()));
                excelDataList.add(new WriteExcelData(i+1,5, revisionRuleVO.getPrefixion()));
                excelDataList.add(new WriteExcelData(i+1,6, revisionRuleVO.getSuffix()));
                excelDataList.add(new WriteExcelData(i+1,7, revisionRuleVO.getDescription()));
                if(!flag){
                    excelDataList.add(new WriteExcelData(i+1,8, Func.format(revisionRuleVO.getCreateTime(),"yyyyå¹´MM月dd日 hh:mm:ss")));
                }
            }
        }
        WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
        ExcelUtil.writeDataToFile(excelPath, excelOption);
        return excelPath;
    }

    /**
     * ä¸‹è½½ç‰ˆæœ¬è§„则导入模板
     * @param exportFileName
     * @return
     * @throws PLException
     */
    @Override
    public String downloadVersionRuleTemplate(String exportFileName) throws Exception {
        //界面没传名称，使用默认导出名称
        exportFileName = Func.isBlank(exportFileName) ?  "版本规则导入模板_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
        //设置列名
        List<String> columns = this.getCloumns(true);
        //设置必填列
        ColumnNameisRed.clear();
        ColumnNameisRed.add(0);
        ColumnNameisRed.add(3);
        ColumnNameisRed.add(4);

        //写excel
        String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
        try {
            new File(excelPath).createNewFile();
        } catch (Throwable e) {
            throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelPath}, e);
        }
        //设置列
        List<WriteExcelData> excelDataList = new ArrayList<>();
        //设置列头
        for (int index = 0; index < columns.size(); index++) {
            //判断是否为必填列，给必填列设置颜色
            if(ColumnNameisRed.contains(index)){
                WriteExcelData excelData = new WriteExcelData(0, index, columns.get(index));
                excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
                excelDataList.add(excelData);
            }else{
                excelDataList.add(new WriteExcelData(0,index, columns.get(index)));
            }
        }
        WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
        ExcelUtil.writeDataToFile(excelPath, excelOption);
        return excelPath;
    }

    /**
     * å¯¼å…¥ç‰ˆæœ¬è§„则
     * @param file
     * @return
     */
    @Override
    public BaseResult importVersionRules(File file) throws Exception {
        VciBaseUtil.alertNotNull(file,"excel文件");
        if(!file.exists()){
            throw new VciBaseException("导入的excel文件不存在,{0}",new String[]{file.getPath()});
        }
        try{
            //1、读取excel中的数据，组成对象
            ReadExcelOption excelOption = new ReadExcelOption();
            List<OsRevisionRulePO> poList = ExcelUtil.readDataObjectFromExcel(file, OsRevisionRulePO.class,excelOption,(value, po, fieldName)->{});
            //去除都是空的情况
            if(CollectionUtils.isEmpty(poList)){
                return BaseResult.fail(ExcelLangCodeConstant.IMPORT_CONTENT_NULL,new String[]{});
            }
            //excel判重，数据校验，dto对象转换，存储对象转换，执行保存
            List<OsRevisionRuleDTO> dtoList = new ArrayList<>();
            //当前excel中是否重复用的判重Map:（key：判重版本规则名，value：行号）
            Map<String, String> excelReapeat = new HashMap<>();
            //数据库查询是否有已存在的枚举名，方便后续做判重处理
            List<OsRevisionRuleVO> versionRuleVOList = this.getRevisionRuleByIds(poList.stream().map(OsRevisionRulePO::getId).collect(Collectors.toSet()));
            List<String> repeatVrId = new ArrayList<>();
            if(Func.isNotEmpty(versionRuleVOList)){
                repeatVrId = versionRuleVOList.stream().map(OsRevisionRuleVO::getId).collect(Collectors.toList());
            }
            //判断必填属性是否为空和其他校验
            List<String> finalRepeatVrId = repeatVrId;
            poList.stream().forEach(vrPO -> {
                if(Func.isBlank(vrPO.getId())){//版本规则名判空
                    throw new VciBaseException("第【"+vrPO.getRowIndex()+"】行，versionrulenameerror");
                }else if(excelReapeat.containsKey(vrPO.getId())){//版本规则名表格中判重
                    throw new VciBaseException("第【"+excelReapeat.get(vrPO.getId())+"】行和第【"+vrPO.getRowIndex()+"】行数据，名称重复");
                }else if (Func.isNotEmpty(finalRepeatVrId) && finalRepeatVrId.contains(vrPO.getId())){//判断名称是否与系统中重复
                    throw new VciBaseException("第【"+vrPO.getRowIndex()+"】行，名称在系统中已经存在,请修改!");
                }

                //版本规则名excel中判重处理
                excelReapeat.put(vrPO.getId(),vrPO.getRowIndex());
                OsRevisionRuleDTO revisionRuleDTO = new OsRevisionRuleDTO();
                //revisionRuleDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
                revisionRuleDTO.setId(vrPO.getId());
                revisionRuleDTO.setName(vrPO.getName());
                revisionRuleDTO.setJumpCharacter(vrPO.getJumpCharacter());
                revisionRuleDTO.setInitialValue(vrPO.getInitialValue());
                revisionRuleDTO.setStepLength(vrPO.getStepLength());
                revisionRuleDTO.setPrefixion(vrPO.getPrefixion());
                revisionRuleDTO.setSuffix(vrPO.getSuffix());
                revisionRuleDTO.setDescription(vrPO.getDescription());
                try {
                    //检查版本规则是否合规
                    checkVersionRule(revisionRuleDTO);
                } catch (PLException e) {
                    e.printStackTrace();
                    throw new VciBaseException(VciBaseUtil.getExceptionMessage(e));
                }
                dtoList.add(revisionRuleDTO);
            });
            //执行保存操作
            dtoList.stream().forEach(dto->{
                try {
                    boolean b = platformClientUtil.getVersionService().addVersionRule(dto2VersionRule(dto));
                    if(!b){
                        throw new VciBaseException("save and return false");
                    }
                } catch (PLException e) {
                    e.printStackTrace();
                    throw new VciBaseException("执行保存时出现错误，错误版本规则对象名为：【" + dto.getId() + "】，原因："+VciBaseUtil.getExceptionMessage(e));
                }
            });
        }catch (Exception e){
            if(logger.isErrorEnabled()){
                logger.error("读取excel内容时或保存用户信息时出现了错误，具体原因：",VciBaseUtil.getExceptionMessage(e));
            }
            e.printStackTrace();
            return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
        }
        return BaseResult.success("枚举导入成功！");
    }

    /**
     * èŽ·å–导出或导入模板的列名
     * @param flag æ˜¯å¦èŽ·å–导入模板列名
     * @return
     */
    private List<String> getCloumns(boolean flag){
        if(flag){
            return new ArrayList<>(
                    Arrays.asList(
                            "名称", "标签", "跳跃字符（以逗号分隔）",
                            "初始值", "步长", "前缀", "后缀", "描述"
                    )
            );
        }
        return new ArrayList<>(
                Arrays.asList(
                        "名称", "标签", "跳跃字符", "初始值", "步长",
                        "前缀", "后缀", "描述", "创建时间"
                )
        );
    }

    /**
     * æ¸…除缓存
     */
    @Override

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java

@@ -1,11 +1,7 @@
package com.vci.web.service.impl;

import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.stm.StatePool;
import com.vci.dto.OsAttributeDTO;
import com.vci.pagemodel.OsEnumVO;
import com.vci.po.OsAttributePO;
import com.vci.po.OsStatusPO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -365,14 +361,11 @@
            statePool.name = id;
            statePool.ts = Func.format(ts,VciDateUtil.DateTimeMillFormat);
            statePoolList.add(statePool);
            boolean res = platformClientUtil.getStatePoolService().deleteStatePool(statePool);
            if(!res){
                throw new PLException("500",new String[]{"删除状态名称为【" + id + "】的数据时出现错误!"});
            }
        }
        boolean res = platformClientUtil.getStatePoolService().deleteStatePools(statePoolList.toArray(new StatePool[statePoolList.size()]));
        //clearCache();
        self.selectAllStatusMap();
        return true;
        return res;
    }

    /**
@@ -386,7 +379,7 @@
        statePool.oid = statusDTO.getOid();
        statePool.id = "";
        statePool.name = statusDTO.getId();
        statePool.imagePath = statusDTO.getImagePath();
        //statePool.imagePath = statusDTO.getImagePath();
        statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription();
        String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
        long now = VciDateUtil.getNowTime();
@@ -435,7 +428,7 @@
            OsStatusVO osStatusVO = this.getObjectByOid(oid);
            excelDataList.add(new WriteExcelData(i.get(),0, osStatusVO.getId()));
            excelDataList.add(new WriteExcelData(i.get(),1, osStatusVO.getName()));
            excelDataList.add(new WriteExcelData(i.get(),2, osStatusVO.getImagePath()));
            //excelDataList.add(new WriteExcelData(i.get(),2, osStatusVO.getImagePath()));
            excelDataList.add(new WriteExcelData(i.get(),3, osStatusVO.getDescription()));
            i.getAndIncrement();
        });
@@ -493,10 +486,10 @@
    private List<String> getCloumns(boolean flag){
        if(flag){
            return new ArrayList<>(
                    Arrays.asList("名称(不能为空)", "标签(对名称的解释)","图片(路径)", "描述(可以为空)")
                    Arrays.asList("名称(不能为空)", "标签(对名称的解释)"/*,"图片(路径)"*/, "描述(可以为空)")
            );
        }
        return new ArrayList<>(Arrays.asList("名称", "标签", "图片", "描述"));
        return new ArrayList<>(Arrays.asList("名称", "标签"/*, "图片"*/, "描述"));
    }

    /**
@@ -522,7 +515,6 @@
            List<StatePool> statePoolList = new ArrayList<>();
            //当前excel中是否重复用的判重Map:（key：判重属性，value：行号）
            Map<String, String> excelReapeat = new HashMap<>();
            //判断必填属性是否为空，用户是否已存在，以及部门是否填错等校验逻辑
            poList.stream().forEach(osStatusPO -> {
                try {
                    StatePool dbStatePool = platformClientUtil.getStatePoolService().getStatePool(osStatusPO.getId());
@@ -532,14 +524,14 @@
                } catch (PLException e) {
                    e.printStackTrace();
                    logger.error(e.getMessage());
                    throw new VciBaseException(e.getMessage());
                    throw new VciBaseException(VciBaseUtil.getExceptionMessage(e));
                }
                if(Func.isBlank(osStatusPO.getId())){//属性名判空
                    throw new VciBaseException("第【"+osStatusPO.getRowIndex()+"】行，enumnameerror");
                if(Func.isBlank(osStatusPO.getId())){//状态名判空
                    throw new VciBaseException("第【"+osStatusPO.getRowIndex()+"】行，statusnameerror");
                }else if(!osStatusPO.getId().matches("[a-z A-Z]*")){
                    // çŠ¶æ€æ± åç§°åªèƒ½ä¸ºè‹±æ–‡å­—母
                    throw new VciBaseException("名称只能为英文！");
                }else if(excelReapeat.containsKey(osStatusPO.getId())){//属性名表格中判重
                }else if(excelReapeat.containsKey(osStatusPO.getId())){//状态名表格中判重
                    throw new VciBaseException("第【"+excelReapeat.get(osStatusPO.getId())+"】行和第【"+osStatusPO.getRowIndex()+"】行数据，名称重复");
                }
                //状态名excel中判重处理
@@ -548,7 +540,7 @@
                osStatusDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
                osStatusDTO.setId(osStatusPO.getId());
                osStatusDTO.setName(osStatusPO.getName());
                osStatusDTO.setImagePath(osStatusPO.getImagePath());
                //osStatusDTO.setImagePath(osStatusPO.getImagePath());
                osStatusDTO.setDescription(osStatusPO.getDescription());
                statePoolList.add(statusDTO2DO(osStatusDTO));

@@ -562,7 +554,7 @@
            e.printStackTrace();
            return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);
        }
        return BaseResult.success("枚举导入成功！");
        return BaseResult.success("状态导入成功！");
    }

    /**