From 70b8927e25362c95cd30d1830e9a7fb477709fd2 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@vci-tech.com>
Date: 星期五, 27 十二月 2024 13:29:35 +0800
Subject: [PATCH] 首页配置功能调整
---
/dev/null | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java | 12 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserConfigTypeEnum.java | 121 ++++++++++++++++++++
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java | 141 ++++++++++++++--------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmSessionForLoginImpl.java | 7 -
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java | 17 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java | 13 +
8 files changed, 252 insertions(+), 66 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
index 68fd94e..83b80e3 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/EnumIdConstant.java
@@ -62,4 +62,9 @@
*/
public static final String USER_TYPE_ENUM = "userTypeEnum";
+ /**
+ * 鐢ㄦ埛閰嶇疆鍒嗙被
+ */
+ public static final String USER_CONFIG_TYPE = "userConfigTypeEnum";
+
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java
index 565da1e..e3452db 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java
@@ -1,6 +1,5 @@
package com.vci.dto;
-import com.vci.starter.web.dto.BaseModelDTO;
import lombok.Data;
/**
@@ -9,7 +8,7 @@
* @Date 2024/12/24 15:42
*/
@Data
-public class BdHomeConfigDTO extends BaseModelDTO {
+public class BdHomeConfigDTO{
/**
* 搴忓垪鍖�
@@ -17,6 +16,16 @@
private static final long serialVersionUID = -111533233671413754L;
/**
+ * 鍞竴鏍囪瘑
+ */
+ private String oid;
+
+ /**
+ * 閰嶇疆鍚嶇О
+ */
+ private String name;
+
+ /**
* 缁勪欢
*/
private String module;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserConfigTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserConfigTypeEnum.java
new file mode 100644
index 0000000..24b0ee6
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserConfigTypeEnum.java
@@ -0,0 +1,121 @@
+package com.vci.enumpck;
+
+import com.vci.constant.EnumIdConstant;
+import com.vci.starter.web.annotation.VciEnum;
+import com.vci.starter.web.enumpck.BaseEnum;
+
+/**
+ * @Description 鐢ㄦ埛閰嶇疆鍒嗙被
+ * @Author dangsn
+ * @Date 2024/12/26 17:28
+ */
+@VciEnum(name = EnumIdConstant.USER_CONFIG_TYPE,text = "鐢ㄦ埛閰嶇疆鍒嗙被",description = "鐢ㄦ埛閰嶇疆鍒嗙被")
+public enum UserConfigTypeEnum implements BaseEnum {
+ HOME("home","棣栭〉閰嶇疆"),
+
+ SEARCH("search", "鍏ㄥ眬鎼滅储");
+
+ /**
+ * 鏋氫妇鐨勫��
+ */
+ private String value;
+
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
+
+ /**
+ * 鑾峰彇鏋氫妇鍊�
+ *
+ * @return 鏋氫妇鍊�
+ */
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * 璁剧疆鏋氫妇鍊�
+ *
+ * @param value 鏋氫妇鍊�
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
+ *
+ * @return 鏄剧ず鏂囨湰
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * 璁剧疆鏄剧ず鏂囨湰
+ *
+ * @param text 鏄剧ず鏂囨湰
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * 鏋勯�犲嚱鏁�
+ *
+ * @param value 鍊�
+ * @param text 鏄剧ず鏂囨湰
+ */
+ private UserConfigTypeEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ /**
+ * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
+ *
+ * @param text 鍚嶇О
+ * @return 鏋氫妇鍊�
+ */
+ public static String getValueByText(String text) {
+ for (UserConfigTypeEnum wenum : UserConfigTypeEnum.values()) {
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鍚嶇О
+ */
+ public static String getTextByValue(String value) {
+ for (UserConfigTypeEnum wenum : UserConfigTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
+ */
+ public static UserConfigTypeEnum forValue(String value) {
+ for (UserConfigTypeEnum wenum : UserConfigTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+ return null;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java
deleted file mode 100644
index 1e01589..0000000
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.vci.model;
-
-import com.vci.constant.BtmIdConstant;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * @Description 棣栭〉閰嶇疆鍔熻兘
- * @Author dangsn
- * @Date 2024/12/24 15:05
- */
-@VciBtmType(name = BtmIdConstant.BD_HOME_CONFIG,text = "棣栭〉閰嶇疆鍔熻兘",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-public class BdHomeConfigDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -6291865953564163287L;
-
- /**
- * 缁勪欢
- */
- private String module;
-
- /**
- * 鏍囬
- */
- private String title;
-
- /**
- * 鍥炬爣
- */
- private String icon;
-
- /**
- * 鍒楁暟
- */
- private Integer num;
-
- /**
- * 鍗犳瘮
- */
- private Double ratio;
-
- /**
- * 鎺掑簭鍙�
- */
- private Integer orderNum;
-
- /**
- * 浜哄憳璐﹀彿
- */
- private String userId;
-
- /**
- * 浜哄憳濮撳悕
- */
- private String userName;
-
- public String getModule() {
- return module;
- }
-
- public void setModule(String module) {
- this.module = module;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Double getRatio() {
- return ratio;
- }
-
- public void setRatio(Double ratio) {
- this.ratio = ratio;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java
index 74a10c3..e759f24 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java
@@ -9,7 +9,7 @@
* @Date 2024/12/24 15:33
*/
@Data
-public class BdHomeConfigVO extends BaseModelVO {
+public class BdHomeConfigVO{
/**
* 搴忓垪鍖�
@@ -17,6 +17,16 @@
private static final long serialVersionUID = 2433044100730800252L;
/**
+ * 鍞竴鏍囪瘑
+ */
+ private String oid;
+
+ /**
+ * 閰嶇疆鍚嶇О
+ */
+ private String name;
+
+ /**
* 缁勪欢
*/
private String module;
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java
deleted file mode 100644
index d94ca1d..0000000
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.vci.web.dao;
-
-import com.vci.model.BdHomeConfigDO;
-import com.vci.pagemodel.BatchCBO;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description 棣栭〉閰嶇疆鏁版嵁鎺ュ彛
- * @Author dangsn
- * @Date 2024/12/24 15:46
- */
-public interface HomeConfigDaoI {
- /**
- * 娣诲姞鏁版嵁
- * @param record 鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(BdHomeConfigDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<BdHomeConfigDO> records);
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO update(BdHomeConfigDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<BdHomeConfigDO> records);
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oidCollection 鏁版嵁涓婚敭闆嗗悎
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKeys(Collection<String> oidCollection);
-
- /**
- * 鍒犻櫎涓氬姟閫氱煡
- * @param record 涓氬姟閫氱煡瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO delete(BdHomeConfigDO record);
-
- /**
- * 鎵归噺鍒犻櫎鏁版嵁
- * @param recordList 鏁版嵁闆嗗悎
- */
- BatchCBO batchDelete(List<BdHomeConfigDO> recordList);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- BdHomeConfigDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<BdHomeConfigDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<BdHomeConfigDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<BdHomeConfigDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<BdHomeConfigDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
-}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java
deleted file mode 100644
index 876909c..0000000
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package com.vci.web.dao.impl;
-
-import com.vci.constant.FrameWorkBusLangCodeConstant;
-import com.vci.model.BdHomeConfigDO;
-import com.vci.pagemodel.BatchCBO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.dao.HomeConfigDaoI;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Repository;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description 棣栭〉閰嶇疆鏁版嵁鏈嶅姟
- * @Author dangsn
- * @Date 2024/12/24 15:47
- */
-@Repository
-public class HomeConfigDaoImpl implements HomeConfigDaoI {
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Resource
- private WebBoServiceI boService;
-
- /**
- * 娣诲姞鏁版嵁
- *
- * @param record 鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO insert(BdHomeConfigDO record) {
- VciBaseUtil.alertNotNull(record,"瑕佹坊鍔犵殑鏁版嵁");
- return boService.addSave(record);
- }
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- *
- * @param records 鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- @Override
- public BatchCBO batchInsert(List<BdHomeConfigDO> records) {
- VciBaseUtil.alertNotNull(records,"瑕佹坊鍔犵殑鏁版嵁");
- return boService.batchAddSave(records);
- }
-
- /**
- * 鏇存柊瀵硅薄
- *
- * @param record 浜у搧璋堜环璁″垝鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO update(BdHomeConfigDO record) {
- VciBaseUtil.alertNotNull(record,"瑕佷慨鏀圭殑瀵硅薄",record.getOid(),"鏁版嵁涓婚敭");
- return boService.editSave(record);
- }
-
- /**
- * 鎵归噺鏇存柊
- *
- * @param records 鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- @Override
- public BatchCBO batchUpdate(List<BdHomeConfigDO> records) {
- VciBaseUtil.alertNotNull(records,"瑕佷慨鏀圭殑瀵硅薄");
- return boService.batchEditSave(records);
- }
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- *
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO deleteByPrimaryKey(String oid) {
- WebUtil.alertNotNull(oid, "鏁版嵁涓婚敭");
- BdHomeConfigDO record = selectByPrimaryKey(oid);
- return boService.delete(record);
- }
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- *
- * @param oidCollection 鏁版嵁涓婚敭闆嗗悎
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO deleteByPrimaryKeys(Collection<String> oidCollection) {
- WebUtil.alertNotNull(oidCollection, "鏁版嵁涓婚敭闆嗗悎");
- List<BdHomeConfigDO> homeConfigDOList = selectByPrimaryKeyCollection(oidCollection);
- return boService.batchDelete(homeConfigDOList);
- }
-
- /**
- * 鍒犻櫎涓氬姟閫氱煡
- *
- * @param record 涓氬姟閫氱煡瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO delete(BdHomeConfigDO record) {
- return boService.delete(record);
- }
-
- /**
- * 鎵归噺鍒犻櫎鏁版嵁
- *
- * @param recordList 鏁版嵁闆嗗悎
- */
- @Override
- public BatchCBO batchDelete(List<BdHomeConfigDO> recordList) {
- BatchCBO batchCBO = new BatchCBO();
- if(!CollectionUtils.isEmpty(recordList)){
- batchCBO.copyFromOther(boService.batchDelete(recordList));
- }
- return batchCBO;
- }
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- *
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- @Override
- public BdHomeConfigDO selectByPrimaryKey(String oid) {
- VciBaseUtil.alertNotNull(oid,"鏁版嵁涓婚敭");
- BdHomeConfigDO record = boService.selectByOid(oid, BdHomeConfigDO.class);
- if(record == null || StringUtils.isBlank(record.getOid())){
- throw new VciBaseException(FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST);
- }
- return record;
- }
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- *
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- @Override
- public List<BdHomeConfigDO> selectByPrimaryKeys(String oids) {
- VciBaseUtil.alertNotNull(oids,"鏁版嵁涓婚敭闆嗗悎");
- return boService.selectByOidCollection(VciBaseUtil.str2List(oids), BdHomeConfigDO.class);
- }
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- *
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- @Override
- public List<BdHomeConfigDO> selectByPrimaryKeyCollection(Collection<String> oids) {
- VciBaseUtil.alertNotNull(oids,"鏁版嵁涓婚敭闆嗗悎");
- return boService.selectByOidCollection(oids, BdHomeConfigDO.class);
- }
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- *
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- @Override
- public List<BdHomeConfigDO> selectByCondition(Map<String, String> conditionMap, PageHelper pageHelper) {
- return boService.queryObject(BdHomeConfigDO.class,conditionMap,pageHelper);
- }
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- @Override
- public Long countByCondition(Map<String, String> conditionMap) {
- return VciBaseUtil.getLong(String.valueOf(boService.queryCount(BdHomeConfigDO.class,conditionMap)));
- }
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- *
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- @Override
- public List<BdHomeConfigDO> selectByWrapper(VciQueryWrapperForDO queryWrapper) {
- return boService.selectByQueryWrapper(queryWrapper,BdHomeConfigDO.class);
- }
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- *
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- @Override
- public Long countByWrapper(VciQueryWrapperForDO queryWrapper) {
- return VciBaseUtil.getLong(String.valueOf(boService.countByQueryWrapper(queryWrapper,BdHomeConfigDO.class)));
- }
-}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java
index 668dbcf..3b61c18 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java
@@ -1,24 +1,24 @@
package com.vci.web.service.impl;
+import com.vci.corba.framework.data.UserConfig;
import com.vci.dto.BdHomeConfigDTO;
-import com.vci.model.BdHomeConfigDO;
+import com.vci.enumpck.UserConfigTypeEnum;
import com.vci.pagemodel.BdHomeConfigVO;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.dao.HomeConfigDaoI;
import com.vci.web.service.HomeConfigServiceI;
+import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description 棣栭〉閰嶇疆鏈嶅姟
@@ -29,15 +29,10 @@
public class HomeConfigServiceImpl implements HomeConfigServiceI {
/**
- * 鏃ュ織
+ * 骞冲彴璋冪敤瀹㈡埛绔�
*/
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 棣栭〉閰嶇疆鏁版嵁鏈嶅姟
- */
- @Resource
- private HomeConfigDaoI homeConfigDaoI;
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
/**
* 鏂板棣栭〉閰嶇疆
@@ -46,13 +41,21 @@
*/
@Override
public void addData(BdHomeConfigDTO homeConfigDTO) {
- BdHomeConfigDO homeConfigDO = new BdHomeConfigDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(homeConfigDTO, homeConfigDO);
- homeConfigDO.setOid(WebUtil.getPk());
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfo();
- homeConfigDO.setUserId(sessionInfo.getUserId());
- homeConfigDO.setUserName(sessionInfo.getUserName());
- homeConfigDaoI.insert(homeConfigDO);
+ String oid = WebUtil.getPk();
+ homeConfigDTO.setOid(oid);
+ UserConfig userConfig = new UserConfig();
+ userConfig.oid = homeConfigDTO.getOid();
+ userConfig.name = homeConfigDTO.getName();
+ userConfig.type = UserConfigTypeEnum.HOME.getValue();
+ userConfig.content = WebUtil.getJSONStringWithDateFormat(homeConfigDTO);
+ userConfig.userId = sessionInfo.getUserId();
+ userConfig.userName = sessionInfo.getUserName();
+ try {
+ platformClientUtil.getFrameworkService().saveUserConfig(userConfig);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
/**
@@ -63,14 +66,19 @@
@Override
public void editData(BdHomeConfigDTO homeConfigDTO) {
WebUtil.alertNotNull(homeConfigDTO.getOid(), "鏁版嵁涓婚敭");
- BdHomeConfigDO homeConfigDO = homeConfigDaoI.selectByPrimaryKey(homeConfigDTO.getOid());
- homeConfigDO.setModule(homeConfigDTO.getModule());
- homeConfigDO.setIcon(homeConfigDTO.getIcon());
- homeConfigDO.setTitle(homeConfigDTO.getTitle());
- homeConfigDO.setNum(homeConfigDTO.getNum());
- homeConfigDO.setRatio(homeConfigDTO.getRatio());
- homeConfigDO.setOrderNum(homeConfigDTO.getOrderNum());
- homeConfigDaoI.update(homeConfigDO);
+ SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfo();
+ UserConfig userConfig = new UserConfig();
+ userConfig.oid = homeConfigDTO.getOid();
+ userConfig.name = homeConfigDTO.getName();
+ userConfig.type = UserConfigTypeEnum.HOME.getValue();
+ userConfig.content = WebUtil.getJSONStringWithDateFormat(homeConfigDTO);
+ userConfig.userId = sessionInfo.getUserId();
+ userConfig.userName = sessionInfo.getUserName();
+ try {
+ platformClientUtil.getFrameworkService().saveUserConfig(userConfig);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
/**
@@ -82,7 +90,13 @@
public void delData(BdHomeConfigDTO homeConfigDTO) {
WebUtil.alertNotNull(homeConfigDTO.getOid(), "鏁版嵁涓婚敭");
List<String> oidList = WebUtil.str2List(homeConfigDTO.getOid());
- homeConfigDaoI.deleteByPrimaryKeys(oidList);
+ if(!CollectionUtils.isEmpty(oidList)){
+ try {
+ platformClientUtil.getFrameworkService().batchDeleteUserConfigByOids(oidList.toArray(new String[0]));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
/**
@@ -94,26 +108,26 @@
@Override
public BdHomeConfigVO getDataByOid(String oid) {
WebUtil.alertNotNull(oid, "鏁版嵁涓婚敭");
- BdHomeConfigDO homeConfigDO = homeConfigDaoI.selectByPrimaryKey(oid);
-
-
- return null;
+ try {
+ UserConfig userConfig = platformClientUtil.getFrameworkService().getUserConfigByOid(oid);
+ return DO2VO(userConfig);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
- private List<BdHomeConfigVO> DOS2VOS(Collection<BdHomeConfigDO> doCollection){
+ private List<BdHomeConfigVO> DOS2VOS(UserConfig[] userConfigArray){
List<BdHomeConfigVO> voList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(doCollection)){
- doCollection.forEach(DO->{
- voList.add(DO2VO(DO));
- });
+ if(userConfigArray != null && userConfigArray.length>0){
+ for(UserConfig userConfig : userConfigArray){
+ voList.add(DO2VO(userConfig));
+ }
}
return voList;
}
- private BdHomeConfigVO DO2VO(BdHomeConfigDO DO){
- BdHomeConfigVO vo = new BdHomeConfigVO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(DO, vo);
- return vo;
+ private BdHomeConfigVO DO2VO(UserConfig userConfig){
+ return WebUtil.jsonString2JavaBean(userConfig.content, BdHomeConfigVO.class);
}
/**
@@ -132,16 +146,30 @@
if(pageHelper == null){
pageHelper = new PageHelper();
}
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, BdHomeConfigDO.class, pageHelper);
- List<BdHomeConfigDO> doList = homeConfigDaoI.selectByWrapper(wrapper);
+
+ SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfo();
+ UserConfig userConfig = new UserConfig();
+ userConfig.userId = sessionInfo.getUserId();
+ userConfig.userName = sessionInfo.getUserName();
+ userConfig.name = conditionMap.getOrDefault("name", "");
+ userConfig.type = UserConfigTypeEnum.HOME.getValue();
+
+ long count;
+ List<BdHomeConfigVO> voList = new ArrayList<>();
+ try {
+ UserConfig[] userConfigArray = platformClientUtil.getFrameworkService().getPageUserConfig(userConfig, pageHelper.getPage(), pageHelper.getLimit());
+ voList.addAll(DOS2VOS(userConfigArray));
+
+ count = platformClientUtil.getFrameworkService().getCountUserConfig(userConfig);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
DataGrid<BdHomeConfigVO> dataGrid = new DataGrid<>();
dataGrid.setPage(pageHelper.getPage());
dataGrid.setLimit(pageHelper.getLimit());
- dataGrid.setData(DOS2VOS(doList));
-
- wrapper.clearPage();
- dataGrid.setTotal(homeConfigDaoI.countByWrapper(wrapper));
+ dataGrid.setData(voList);
+ dataGrid.setTotal(count);
return dataGrid;
}
@@ -153,8 +181,15 @@
*/
@Override
public List<BdHomeConfigVO> getAllData() {
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(BdHomeConfigDO.class);
- List<BdHomeConfigDO> doList = homeConfigDaoI.selectByWrapper(wrapper);
- return DOS2VOS(doList);
+ SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfo();
+ UserConfig userConfig = new UserConfig();
+ userConfig.userId = sessionInfo.getUserId();
+ userConfig.userName = sessionInfo.getUserName();
+ try {
+ UserConfig[] userConfigArray = platformClientUtil.getFrameworkService().getUserConfig(userConfig);
+ return DOS2VOS(userConfigArray);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
index 282e1d0..367f7e0 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
@@ -33,7 +33,6 @@
import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletRequest;
-import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.*;
import java.math.BigDecimal;
@@ -147,13 +146,27 @@
* @param beanClass Bean鐨勭被
* @return 浠庡垪琛ㄩ噷鑾峰彇绗竴涓璞�
*/
- public static <T> T getFirstObjectFromJson(String jsonString,Class<T> beanClass){
+ public static <T> T getFirstObjectFromJsonArray(String jsonString,Class<T> beanClass){
if(!isNull(jsonString)) {
return JSONObject.parseArray(jsonString, beanClass).get(0);
} else {
return null;
}
}
+
+ /**
+ * 浠巎son瀛楃涓蹭腑鑾峰彇绗竴涓璞�
+ * @param jsonString json鐨勫瓧绗︿覆
+ * @param beanClass Bean鐨勭被
+ * @return 浠庡垪琛ㄩ噷鑾峰彇绗竴涓璞�
+ */
+ public static <T> List<T> getObjectListFromJsonArray(String jsonString,Class<T> beanClass){
+ if(!isNull(jsonString)) {
+ return JSONObject.parseArray(jsonString, beanClass);
+ } else {
+ return null;
+ }
+ }
/**
* 鑾峰彇sessionInfo瀵硅薄
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmSessionForLoginImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmSessionForLoginImpl.java
index d8b802e..072665b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmSessionForLoginImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmSessionForLoginImpl.java
@@ -200,12 +200,7 @@
*/
@Override
public void logout(String userToken) {
- WebUtil.alertNotNull(userToken,"鐢ㄦ埛璁稿彲");
- try{
- platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where TOKEN ='" + userToken.trim() + "'");
- }catch (PLException e){
- throw WebUtil.getVciBaseException(e);
- }
+ //TODO 鏍规嵁鎯呭喌锛屽崟鐙鐞�
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/properties/usedNames.properties b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/properties/usedNames.properties
deleted file mode 100644
index 222da11..0000000
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/properties/usedNames.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-sysUsedNames = OID,REVISIONOID,NAMEOID,BtmName,ISLastR,ISFirstR,ISLastV,ISFirstV,Creator,CreateTime,LastModifier,LastModifyTime,RevisionRule,VersionRule,RevisionSeq,RevisionValue,VersionSeq,VersionValue,LCTID,LCStatus,TS,ID,NAME,DESCRIPTION,OWNER,CHECKINBY,CHECKINTIME,CHECKOUTBY,CHECKOUTTIME,COPYFROMVERSION,NEWOID,NEWREVISIONOID
-dataBaseUsedNames = ACCESS,ADD,ALL,ALTER,AND,ANY,AS,ASC,AUDIT,BETWEEN,BY,CHAR,CHECK,CLUSTER,COLUMN,COMMENT,COMPRESS,CONNECT,CREATE,CURRENT,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FILE,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IMMEDIATE,IN,INCREMENT,INDEX,INITIAL,INSERT,INTEGER,INTERSECT,INTO,IS,LEVEL,LIKE,LOCK,LONG,MAXEXTENTS,MINUS,MLSLABEL,MODE,MODIFY,NOAUDIT,NOCOMPRESS,NOT,NOWAIT,NULL,NUMBER,OF,OFFLINE,ON,ONLINE,OPTION,OR,ORDER,P,CTFREE,PRIOR,PRIVILEGES,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,ROW,ROWID,ROWNUM,ROWS,SELECT,SESSION,SET,SHARE,SIZE,SMALLINT,START,SUCCESSFUL,SYNONYM,SYSDATE,TABLE,THEN,TO,TRIGGER,UID,UNION,UNIQUE,UPDATE,USER,VALIDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHENEVER,WHERE,WITH
\ No newline at end of file
--
Gitblit v1.9.3