From 696c68a9f7645bc35a9382a4e2271910b222f7b5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 七月 2024 16:16:34 +0800
Subject: [PATCH] 状态池列表查询、查看应用范围接口上传
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java | 65 ++++++++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java | 59 ++++++++++++--
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java | 13 +++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 8 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 53 ++++++++++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java | 5
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 8 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java | 10 +-
11 files changed, 186 insertions(+), 41 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
index 9c1890b..5771a28 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsStatusDTO.java
@@ -33,10 +33,75 @@
private String description;
/**
+ * 鍥剧墖璺緞
+ */
+ public String imagePath;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creator;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ /**
+ * 鏈�鍚庝慨鏀逛汉
+ */
+ private String lastModifier;
+
+ /**
+ * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
+ */
+ private Date lastModifyTime;
+
+ /**
* 鏃堕棿鎴筹紝鐢ㄤ簬鏍￠獙鏄惁鏈�鏂版暟鎹�
*/
private Date ts;
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public void setLastModifier(String lastModifier) {
+ this.lastModifier = lastModifier;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public String getLastModifier() {
+ return lastModifier;
+ }
+
+ public Date getLastModifyTime() {
+ return lastModifyTime;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
public String getOid() {
return oid;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
index ce790e9..c484307 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsStatusVO.java
@@ -36,6 +36,11 @@
private String description;
/**
+ * 鍥剧墖璺緞
+ */
+ public String imagePath;
+
+ /**
* 涓氬姟绫诲瀷鍚嶇О
*/
private String btmname;
@@ -70,6 +75,14 @@
*/
private Date ts;
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
public String getOid() {
return oid;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index d08bcbb..6a52208 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -117,7 +117,7 @@
/**
* 蹇呭～鍒�
*/
- private ArrayList<Integer> ColumnNameisRed = new ArrayList<Integer>();
+ private List<Integer> ColumnNameisRed = new ArrayList<Integer>();
/**
* 鐢ㄦ埛鍒嗛〉鏌ヨ鏃惰幏鍙栭儴闂ㄦ斁鍒拌繖閲岄伩鍏嶉噸澶嶆煡璇�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
index f33a04a..adf0e3e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
@@ -52,7 +52,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
@GetMapping("/gridAttribute")
- @VciUnCheckRight
+ @VciBusinessLog(operateName = "灞炴�у垪琛�")
public BaseResult<OsAttributeVO> gridAttribute(BaseQueryObject baseQueryObject){
try {
return BaseResult.dataGrid(attributeService.gridAttribute(baseQueryObject));
@@ -107,7 +107,6 @@
*/
@PutMapping( "/updateAttribute")
@VciBusinessLog(operateName = "淇敼灞炴��")
- @VciUnCheckRight
public BaseResult updateAttribute(@RequestBody OsAttributeDTO osAttributeDTO) {
try {
return attributeService.updateAttribute(osAttributeDTO) ? BaseResult.success("灞炴�т慨鏀规垚鍔燂紒"):BaseResult.fail("灞炴�т慨鏀瑰け璐ワ紒");
@@ -208,7 +207,7 @@
* @return
*/
@PostMapping("/importAttributes")
- @VciUnCheckRight
+ @VciBusinessLog(operateName = "瀵煎叆灞炴��")
public BaseResult importAttributes(MultipartFile file){
String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
File file1 = new File(excelFileName);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
index 718362f..db761d4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
@@ -7,8 +8,11 @@
import com.vci.dto.OsStatusDTO;
import com.vci.pagemodel.OsLifeCycleVO;
import com.vci.pagemodel.OsStatusVO;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,14 +39,27 @@
private OsLifeCycleServiceI lifeCycleService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 鐘舵�佺殑鍒楄〃
* @param queryObject 鏌ヨ瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
@GetMapping("/gridStatus")
@VciBusinessLog(operateName = "鏌ョ湅鐘舵�佸垪琛�")
- public DataGrid<OsStatusVO> gridStatus(BaseQueryObject queryObject){
- return statusService.gridStatus(queryObject.getConditionMap(),queryObject.getPageHelper());
+ @VciUnCheckRight
+ public BaseResult<OsStatusVO> gridStatus(BaseQueryObject queryObject){
+ try {
+ return BaseResult.dataGrid(statusService.gridStatus(queryObject.getConditionMap(),queryObject.getPageHelper()));
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "灞炴�х鐞嗗垪琛ㄦ煡璇㈡椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -51,8 +68,17 @@
* @return 浣跨敤鐨勭敓鍛藉懆鏈熺殑瀵硅薄
*/
@GetMapping("/listUsed")
- public DataGrid<OsLifeCycleVO> listUsed(String oid){
- return lifeCycleService.listStatusUsed(oid);
+ @VciBusinessLog(operateName = "鏌ヨ鐘舵�佹睜鐨勫簲鐢ㄨ寖鍥�")
+ @VciUnCheckRight
+ public BaseResult<OsLifeCycleVO> listUsed(String oid){
+ try {
+ return BaseResult.dataGrid(lifeCycleService.listStatusUsed(oid));
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "灞炴�х鐞嗗垪琛ㄦ煡璇㈡椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -61,9 +87,16 @@
* @return 鎵ц缁撴灉
*/
@PostMapping("/addSave")
- public BaseResult addSave(OsStatusDTO statusDTO){
- statusService.addSave(statusDTO);
- return BaseResult.success();
+ @VciUnCheckRight
+ public BaseResult addSave(@RequestBody OsStatusDTO statusDTO){
+ try {
+ return statusService.addSave(statusDTO) ? BaseResult.success("娣诲姞鐘舵�佹垚鍔燂紒"):BaseResult.fail("娣诲姞鐘舵�佸け璐ワ紒");
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "娣诲姞鐘舵�佹椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -72,9 +105,15 @@
* @return 鎵ц缁撴灉
*/
@PutMapping("/editSave")
- public BaseResult editSave(OsStatusDTO statusDTO){
- statusService.editSave(statusDTO);
- return BaseResult.success();
+ public BaseResult editSave(@RequestBody OsStatusDTO statusDTO){
+ try {
+ return statusService.editSave(statusDTO) ? BaseResult.success("淇敼鐘舵�佹垚鍔燂紒"):BaseResult.fail("淇敼鐘舵�佸け璐ワ紒");
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = "淇敼鐘舵�佹椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
index f3b3835..823735a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
@@ -54,13 +54,13 @@
* 鎵归噺娣诲姞鐘舵��
* @param statePoolList 鐘舵�佸唴瀹�
*/
- void batchAddStatus(List<StatePool> statePoolList);
+ boolean batchAddStatus(List<StatePool> statePoolList) throws Exception;
/**
* 鎵归噺淇敼鐘舵��
* @param statePoolList 鐘舵�佸唴瀹�
*/
- void batchEditSave(List<StatePool> statePoolList);
+ boolean batchEditSave(List<StatePool> statePoolList) throws Exception;
/**
* 鐘舵�佸垪琛�
@@ -88,19 +88,19 @@
* 娣诲姞鐘舵��
* @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
*/
- void addSave(OsStatusDTO statusDTO);
+ boolean addSave(OsStatusDTO statusDTO) throws Exception;
/**
* 缂栬緫鐘舵��
* @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
*/
- void editSave(OsStatusDTO statusDTO);
+ boolean editSave(OsStatusDTO statusDTO)throws Exception ;
/**
* 鍒犻櫎鐘舵��
* @param oids 涓婚敭
*/
- void delete(String oids);
+ boolean delete(String oids);
/**
* 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄杞崲涓烘暟鎹璞�
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 2d0e461..7a4ac81 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
@@ -511,7 +511,7 @@
if(hasInstance && !compatible){
throw new PLException("500",new String[]{"鏃犳晥鍙樻洿, 涓嶅吋瀹瑰凡浜х敓鐨勬暟鎹紒"});
}
- String userId = "developer";//WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
osAttributeDTO.setLastModifier(userId);
osAttributeDTO.setCreator(osAttributeVO.getCreator());
osAttributeDTO.setCreateTime(osAttributeVO.getCreateTime());
@@ -557,9 +557,9 @@
attributeDef.rage = osAttributeDTO.getRange().replace("<","<");
}
attributeDef.ts = Func.format((Func.isNotEmpty(osAttributeDTO.getTs()) ? osAttributeDTO.getTs():new Date()),VciDateUtil.DateTimeMillFormat);
- attributeDef.creator = "developer";//Func.isBlank(osAttributeDTO.getCreator()) ? WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId():osAttributeDTO.getCreator();
+ attributeDef.creator = Func.isBlank(osAttributeDTO.getCreator()) ? WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId():osAttributeDTO.getCreator();
attributeDef.createTime = Func.isEmpty(osAttributeDTO.getCreateTime()) ? System.currentTimeMillis():osAttributeDTO.getCreateTime().getTime();
- attributeDef.modifier = "developer";//Func.isBlank(osAttributeDTO.getLastModifier()) ? WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId():osAttributeDTO.getLastModifier();
+ attributeDef.modifier = Func.isBlank(osAttributeDTO.getLastModifier()) ? WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId():osAttributeDTO.getLastModifier();
attributeDef.modifyTime = System.currentTimeMillis();
//other闇�瑕佽嚜琛屽鐞�
StringBuffer sb = new StringBuffer();
@@ -1045,7 +1045,7 @@
}
} catch (PLException e) {
e.printStackTrace();
- throw new VciBaseException("鎵ц淇濆瓨鏃跺嚭鐜伴敊璇紝閿欒灞炴�у璞″悕涓猴細銆�" + dto.getId() + "銆戯紝鍘熷洜锛�"+e.getMessage());
+ throw new VciBaseException("鎵ц淇濆瓨鏃跺嚭鐜伴敊璇紝閿欒灞炴�у璞″悕涓猴細銆�" + dto.getId() + "銆戯紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e));
}
});
}catch (Exception e){
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 97f5267..1a59db5 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
@@ -392,7 +392,7 @@
//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
exportFileName = Func.isBlank(exportFileName) ? "鏋氫妇绫诲瀷瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
//璁剧疆鍒楀悕
- List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"));
+ List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害","鍒涘缓鏃堕棿", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"));
//鍐檈xcel
String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName + ".xls";
@@ -433,9 +433,9 @@
//澶勭悊鏋氫妇椤瑰啓鍏�
for (int j = 0; j < enumVOItems.size(); j++) {
OsEnumItemVO osEnumItemVO = enumVOItems.get(j);
- excelDataList.add(new WriteExcelData(startRow+j,7, true,osEnumItemVO.getName()));
- excelDataList.add(new WriteExcelData(startRow+j,8, true, osEnumItemVO.getValue()));
- excelDataList.add(new WriteExcelData(startRow+j,9, true, osEnumItemVO.getDescription()));
+ excelDataList.add(new WriteExcelData(startRow+j,5, true,osEnumItemVO.getName()));
+ excelDataList.add(new WriteExcelData(startRow+j,6, true, osEnumItemVO.getValue()));
+ excelDataList.add(new WriteExcelData(startRow+j,7, true, osEnumItemVO.getDescription()));
}
startRow += enumVOItems.size();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index a1deb7c..96c7c05 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -483,7 +483,7 @@
}
/**
- * 鐘舵�佸湪鐢熷懡鍛ㄦ湡涓娇鐢ㄧ殑鍕ゅ揩
+ * 鐘舵�佸湪鐢熷懡鍛ㄦ湡涓娇鐢ㄧ殑鑼冨洿
*
* @param statusOid 鐘舵�佺殑涓婚敭
* @return 鐢熷懡鍛ㄦ湡鐨勪俊鎭�
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 9f3f54c..7bae860 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
@@ -13,9 +13,11 @@
import com.vci.dto.OsStatusDTO;
import com.vci.model.OsStatusDO;
import com.vci.pagemodel.OsStatusVO;
+import com.vci.starter.web.util.WebThreadLocalUtil;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -26,6 +28,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.swing.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -78,11 +81,12 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool) {
+ public OsStatusVO statusDO2VO(StatePool statePool) {
OsStatusVO statusVO = new OsStatusVO();
if(statePool!=null){
statusVO.setOid(statePool.oid);
statusVO.setCreator(statePool.creator);
+ statusVO.setImagePath(statePool.imagePath);
statusVO.setLastModifier(statePool.modifier);
try {
statusVO.setCreateTime(new Date(statePool.createTime));
@@ -105,7 +109,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools) {
+ public List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools) {
List<OsStatusVO> statusVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(statePools)){
statePools.stream().forEach(statePool -> {
@@ -169,7 +173,7 @@
* @param statePoolList 鐘舵�佸唴瀹�
*/
@Override
- public void batchAddStatus(List<StatePool> statePoolList) {
+ public boolean batchAddStatus(List<StatePool> statePoolList) throws Exception{
if(!CollectionUtils.isEmpty(statePoolList)){
for(StatePool statePool : statePoolList) {
try {
@@ -179,6 +183,7 @@
}
}
}
+ return true;
}
/**
@@ -186,7 +191,7 @@
* @param statePoolList 鐘舵�佸唴瀹�
*/
@Override
- public void batchEditSave(List<StatePool> statePoolList) {
+ public boolean batchEditSave(List<StatePool> statePoolList) {
if(!CollectionUtils.isEmpty(statePoolList)){
for(StatePool statePool : statePoolList) {
try {
@@ -196,6 +201,7 @@
}
}
}
+ return true;
}
/**
@@ -255,26 +261,46 @@
* @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
*/
@Override
- public void addSave(OsStatusDTO statusDTO) {
- VciBaseUtil.alertNotNull(statusDTO,"鐘舵�佺殑淇℃伅",statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О",statusDTO.getName(),"鐘舵�佺殑涓枃鍚嶇О");
+ public boolean addSave(OsStatusDTO statusDTO) throws Exception {
+ VciBaseUtil.alertNotNull(
+ statusDTO,"鐘舵�佺殑淇℃伅",
+ statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О",
+ statusDTO.getName(),"鐘舵�佺殑涓枃鍚嶇О"
+ );
+ StatePool dbStatePool = platformClientUtil.getStatePoolService().getStatePool(statusDTO.getName());
+ if (Func.isNotEmpty(dbStatePool) || Func.isNotBlank(dbStatePool.oid)) {
+ throw new PLException("500",new String[]{"鍚嶇О閲嶅璇锋洿鎹㈠悕绉帮紒"});
+ }
+ // 鐘舵�佹睜鍚嶇О鍙兘涓鸿嫳鏂囧瓧姣�
+ String regex = "[a-z A-Z]*";
+ if ((!dbStatePool.name.matches(regex))) {
+ throw new PLException("500",new String[]{"鍚嶇О鍙兘涓鸿嫳鏂囷紒"});
+ }
+ //铏界劧浼氳嚜鍔ㄧ敓鎴恛id锛屼絾鏄繖鍎胯缃富閿紝閬垮厤鏀惧叆缂撳瓨鐨勬暟鎹槸娌℃湁oid鐨�
statusDTO.setOid(VciBaseUtil.getPk());
StatePool pool = statusDTO2DO(statusDTO);
List<StatePool> poolList = new ArrayList<>();
poolList.add(pool);
batchAddStatus(poolList);
- clearCache();
+ //clearCache();
self.selectAllStatusMap();
+ return true;
}
-
/**
* 缂栬緫鐘舵��
* @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
*/
@Override
- public void editSave(OsStatusDTO statusDTO){
- VciBaseUtil.alertNotNull(statusDTO,"鐘舵�佺殑淇℃伅",statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О",statusDTO.getName(),"鐘舵�佺殑涓枃鍚嶇О",statusDTO.getOid(),"涓婚敭");
+ public boolean editSave(OsStatusDTO statusDTO) throws Exception {
+ VciBaseUtil.alertNotNull(statusDTO,"鐘舵�佺殑淇℃伅",
+ statusDTO.getId(),"鐘舵�佺殑鑻辨枃鍚嶇О",
+ statusDTO.getName(),"鐘舵�佺殑涓枃鍚嶇О",
+ statusDTO.getOid(),"涓婚敭");
OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
+ if(Func.isEmpty(statusVO) || Func.isBlank(statusVO.getOid())){
+ throw new PLException("500",new String[]{"淇敼鐨勭姸鎬佸璞′笉瀛樺湪锛�"});
+ }
StatePool pool = statusDTO2DO(statusDTO);
pool.creator = statusVO.getCreator();
pool.createTime = VciDateUtil.getTime(statusVO.getCreateTime());
@@ -283,6 +309,7 @@
batchEditSave(poolList);
clearCache();
self.selectAllStatusMap();
+ return true;
}
/**
@@ -290,7 +317,7 @@
* @param oids 涓婚敭
*/
@Override
- public void delete(String oids){
+ public boolean delete(String oids){
VciBaseUtil.alertNotNull(oids,"涓婚敭");
//鍒ゆ柇鏄惁琚紩鐢�
List<OsStatusVO> statusVOList1 = selectByOidCollection(VciBaseUtil.str2List(oids));
@@ -306,6 +333,7 @@
});
clearCache();
self.selectAllStatusMap();
+ return true;
}
/**
@@ -319,8 +347,9 @@
statePool.oid = statusDTO.getOid();
statePool.id = "";
statePool.name = statusDTO.getId();
+ statePool.imagePath = statusDTO.getImagePath();
statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription();
- String userId = VciBaseUtil.getCurrentUserId();
+ String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
long now = VciDateUtil.getNowTime();
statePool.creator = userId;
statePool.createTime = now;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index e5380cc..51c02df 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -201,7 +201,7 @@
* @param statusDTOList 瑕佸鍏ョ殑鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄鍒楄〃
* @throws VciBaseException 鏌ヨ鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- private void importStatus( Collection<OsStatusDTO> statusDTOList) throws VciBaseException{
+ private void importStatus( Collection<OsStatusDTO> statusDTOList) throws Exception {
//瑕佸鍏ョ殑鐘舵�佺殑鎵�鏈夎嫳鏂囧悕绉�
List<String> statusIdList = new ArrayList<String>();
Iterator<OsStatusDTO> iterator = statusDTOList.iterator();
--
Gitblit v1.9.3