From 0add10ef126bfb861192df3e7c6574910c31a7ae Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 01 八月 2024 17:19:03 +0800
Subject: [PATCH] 版本规则管理所有接口上传（已测试待联调）

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java                  |    1 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java |  316 ++++++++++++++++++++++++++++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java    |  112 +++++++++
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsStatusPO.java                          |    6 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java         |    6 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java       |   32 +-
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsRevisionRulePO.java                    |   78 +++++++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java    |   18 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java         |   40 +++
 9 files changed, 557 insertions(+), 52 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
index 926e593..461a6c1 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsRevisionRuleDTO.java
@@ -64,7 +64,6 @@
      */
     private Date ts;
 
-
     /**
      * 鍒涘缓浜�
      */
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsRevisionRulePO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsRevisionRulePO.java
new file mode 100644
index 0000000..3b628cf
--- /dev/null
+++ b/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;
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsStatusPO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsStatusPO.java
index c443178..8896d9b 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsStatusPO.java
+++ b/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;
 
     /**
      * 鎻忚堪
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java
index 7e178b4..7b4c389 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java
+++ b/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();
+        }
+    }
+
 }
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
index 6c3dfb1..c301a49 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
+++ b/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;
+
 }
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index a4e6359..3af2c48 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/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涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶅睘鎬э紝value锛氳鍙凤級
 			Map<String, String> excelReapeat = new HashMap<>();
-			//鍒ゆ柇蹇呭～灞炴�ф槸鍚︿负绌猴紝鐢ㄦ埛鏄惁宸插瓨鍦紝浠ュ強閮ㄩ棬鏄惁濉敊绛夋牎楠岄�昏緫
 			poList.stream().forEach(osAttributePO -> {
 				if(Func.isBlank(osAttributePO.getId())){//灞炴�у悕鍒ょ┖
-					throw new VciBaseException("绗��"+osAttributePO.getRowIndex()+"銆戣锛宔numnameerror");
+					throw new VciBaseException("绗��"+osAttributePO.getRowIndex()+"銆戣锛宎ttrnameerror");
 				}else if(Func.isBlank(osAttributePO.getAttributeDataType())){
 					throw new VciBaseException("绗��"+osAttributePO.getRowIndex()+"銆戣锛宼ypeerror");
 				}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("灞炴�у鍏ユ垚鍔燂紒");
 	}
 
 	/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 50292b7..c76ea0b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -605,7 +605,7 @@
 			}
 			//褰撳墠excel涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶅睘鎬э紝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()+"銆戣锛屾灇涓惧悕鍦ㄧ郴缁熶腑宸茬粡瀛樺湪,璇蜂慨鏀�!");
 				}
 				//鍏堝鏋氫妇鍚峞xcel涓渶瑕佸垽閲嶅鐞�
@@ -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();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index 08b20db..904da86 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/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());
+            }
+        });
+
+        //骞冲彴鐨刣eleteStatus鏂规硶蹇呬紶涓変釜鍙傛暟锛宱id銆乶ame鍜宼s
+        List<VersionRule> vrList = new ArrayList<>();
+        for(OsRevisionRuleDTO vrDTO : osRevisionRuleDTOS){
+            //oid鍜宼s鍒ょ┖
+            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[]{"寰呭垹闄ょ殑鐘舵�佸垪琛ㄤ腑涓婚敭銆恛id銆戙�佽皟鏁存椂闂淬�恡s銆戙�佺姸鎬佸悕绉般�恘ame銆戜笉鑳戒负绌猴紒"});
+            }
+            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);
+
+        //鍐檈xcel
+        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骞碝M鏈坉d鏃� 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);
+
+        //鍐檈xcel
+        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("瀵煎叆鐨別xcel鏂囦欢涓嶅瓨鍦�,{0}",new String[]{file.getPath()});
+        }
+        try{
+            //1銆佽鍙杄xcel涓殑鏁版嵁锛岀粍鎴愬璞�
+            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涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶇増鏈鍒欏悕锛寁alue锛氳鍙凤級
+            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()+"銆戣锛寁ersionrulenameerror");
+                }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()+"銆戣锛屽悕绉板湪绯荤粺涓凡缁忓瓨鍦�,璇蜂慨鏀�!");
+                }
+
+                //鐗堟湰瑙勫垯鍚峞xcel涓垽閲嶅鐞�
+                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
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 13dfada..52e0be9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/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涓槸鍚﹂噸澶嶇敤鐨勫垽閲峂ap:锛坘ey锛氬垽閲嶅睘鎬э紝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()+"銆戣锛宔numnameerror");
+                if(Func.isBlank(osStatusPO.getId())){//鐘舵�佸悕鍒ょ┖
+                    throw new VciBaseException("绗��"+osStatusPO.getRowIndex()+"銆戣锛宻tatusnameerror");
                 }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("鐘舵�佸鍏ユ垚鍔燂紒");
     }
 
     /**

--
Gitblit v1.9.3