From 370b26066c560f15f6a84caca2be149e48e86556 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 07 一月 2025 15:52:05 +0800
Subject: [PATCH] 系统菜单 默认显示&&系统配置、对象建模按钮权限以及按钮图标

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
index 9abee0c..4d84346 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
@@ -9,6 +9,7 @@
 import com.vci.model.SmPasswordStrategyForPlatform1;
 import com.vci.omd.utils.ObjectTool;
 import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.starter.web.enumpck.VciFieldTypeEnum;
 import com.vci.starter.web.util.BeanUtilForVCI;
 import com.vci.web.service.SmUserQueryServiceI;
 import com.vci.starter.web.constant.QueryOptionConstant;
@@ -31,6 +32,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -93,7 +96,7 @@
      * @return
      */
     @Override
-    public DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) throws PLException {
+    public DataGrid<SmPasswordStrategyVO> refDataGrid(Map<String, String> conditionMap, PageHelper pageHelper) throws Exception {
         if(pageHelper == null){
             pageHelper = new PageHelper(-1);
         }
@@ -138,13 +141,13 @@
      * @param smPasswordStrategyForPlatform1s 鍘熷钩鍙扮殑瀵嗙爜绛栫暐
      * @return
      */
-    private List<SmPasswordStrategyVO> pltPwdStrategy2SmPwdStrategyVOs(List<SmPasswordStrategyForPlatform1> smPasswordStrategyForPlatform1s) throws PLException{
+    private List<SmPasswordStrategyVO> pltPwdStrategy2SmPwdStrategyVOs(List<SmPasswordStrategyForPlatform1> smPasswordStrategyForPlatform1s) throws Exception{
         List<SmPasswordStrategyVO> smPasswordStrategyVOList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(smPasswordStrategyForPlatform1s)){
             smPasswordStrategyForPlatform1s.stream().forEach(s -> {
                 try {
                     smPasswordStrategyVOList.add(pltPwdStrategy2SmPwdStrategyVO(s));
-                } catch (PLException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                     String exceptionMessage = "Platform1瀵硅薄杞琕O瀵硅薄鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e);
                     logger.error(exceptionMessage);
@@ -160,7 +163,7 @@
      * @param strategyForPlatform1 鍘熷钩鍙扮殑瀵嗙爜绛栫暐
      * @return 鏂扮殑瀵嗙爜绛栫暐瀵硅薄
      */
-    private SmPasswordStrategyVO pltPwdStrategy2SmPwdStrategyVO(SmPasswordStrategyForPlatform1 strategyForPlatform1) throws PLException {
+    private SmPasswordStrategyVO pltPwdStrategy2SmPwdStrategyVO(SmPasswordStrategyForPlatform1 strategyForPlatform1) throws PLException, ParseException {
         SmPasswordStrategyVO strategyVO = new SmPasswordStrategyVO();
         strategyVO.setOid(strategyForPlatform1.getPluid());
         strategyVO.setId("");
@@ -173,9 +176,14 @@
         strategyVO.setLockTime(strategyForPlatform1.getPlocktime());
         strategyVO.setDefaultFlag(strategyForPlatform1.getPlisdefault() == 1);
         strategyVO.setDescription(strategyForPlatform1.getPldesc());
-        strategyVO.setCreateTime(new Date(strategyForPlatform1.getPlcreatetime()));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        if(Func.isNotEmpty(strategyForPlatform1.getPlcreatetime())){
+            strategyVO.setCreateTime(sdf.parse(strategyForPlatform1.getPlcreatetime()));
+        }
         strategyVO.setCreator(strategyForPlatform1.getPlcreateuser());
-        strategyVO.setLastModifyTime(new Date(strategyForPlatform1.getPlupdatetime()));
+        if(Func.isNotEmpty(strategyForPlatform1.getPlupdatetime())){
+            strategyVO.setLastModifyTime(sdf.parse(strategyForPlatform1.getPlupdatetime()));
+        }
         strategyVO.setLastModifier(strategyForPlatform1.getPlupdateuser());
         strategyVO.setLicensors(strategyForPlatform1.getPllicensors());
         strategyVO.setRequireCharCount(strategyForPlatform1.getPlrequiredtype());
@@ -316,7 +324,7 @@
      * @param conditionMap
      * @return
      */
-    private List<SmPasswordStrategyVO> getPwdStrategyByCondition(Map<String,String> conditionMap) throws PLException {
+    private List<SmPasswordStrategyVO> getPwdStrategyByCondition(Map<String,String> conditionMap) throws Exception {
         if(Func.isEmpty(conditionMap)){
             conditionMap = new HashMap();
         }
@@ -334,7 +342,7 @@
      * @return
      */
     @Override
-    public boolean addPasswordStrateg(SmPasswordStrategyDTO spsDto) throws PLException {
+    public boolean addPasswordStrateg(SmPasswordStrategyDTO spsDto) throws Exception {
         VciBaseUtil.alertNotNull(
                 spsDto,"鏂板鐨勫瘑鐮佺瓥鐣ュ璞�",
                 spsDto.getName(),"绛栫暐鍚嶇О",
@@ -376,7 +384,7 @@
      * @return
      */
     @Override
-    public boolean updatePasswordStrateg(SmPasswordStrategyDTO spsDto) throws PLException {
+    public boolean updatePasswordStrateg(SmPasswordStrategyDTO spsDto) throws Exception {
         VciBaseUtil.alertNotNull(
                 spsDto,"鏂板鐨勫瘑鐮佺瓥鐣ュ璞�",
                 spsDto.getOid(),"绛栫暐涓婚敭",

--
Gitblit v1.9.3