From a45d0bcbea9078e54da9956c619dacb3c51fe1f1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:30:58 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 3 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/MdmCount.java | 45 +++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IMdmCountService.java | 21 +++++++
Source/UBCS-WEB/src/views/wel/index.vue | 2
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 17 +++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmCountServiceImpl.java | 49 ++++++++++++++++
6 files changed, 130 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index d08f5a8..a085ad3 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -7,7 +7,7 @@
</el-row>
<el-row>
<el-col :span="24">
- <basic-container title="寰呭姙浜嬮」">
+ <basic-container title="涓绘暟鎹粺璁�">
<Statistic></Statistic>
</basic-container>
</el-col>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/MdmCount.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/MdmCount.java
new file mode 100644
index 0000000..45a7de7
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/MdmCount.java
@@ -0,0 +1,45 @@
+package com.vci.ubcs.code.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 涓绘暟鎹粺璁″璞�
+ * @author ludc
+ * @date 2023/10/16 16:04
+ */
+@Data
+public class MdmCount implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 5020487634341423512L;
+
+ /**
+ * 涓绘暟鎹悕绉�
+ */
+ private String menuName;
+
+ /**
+ * 涓绘暟鎹�绘暟
+ */
+ private String mdmCount;
+
+ /**
+ * 鑿滃崟璺敱
+ */
+ private String menuRoute;
+
+ /**
+ * 鑿滃崟鍥炬爣
+ */
+ private String inco;
+
+ /**
+ * 鏄惁榛樿鏄剧ず
+ */
+ private Integer isDefault;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IMdmCountService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IMdmCountService.java
new file mode 100644
index 0000000..5d250e3
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IMdmCountService.java
@@ -0,0 +1,21 @@
+package com.vci.ubcs.code.service;
+
+import com.vci.ubcs.code.entity.MdmCount;
+
+import java.util.List;
+
+/**
+ * 涓绘暟鎹�绘暟缁熻鏈嶅姟
+ * @author ludc
+ * @date 2023/10/16 15:48
+ */
+public interface IMdmCountService {
+
+ /**
+ * 缁熻涓绘暟鎹�绘暟
+ * @return
+ */
+ List<MdmCount> getMdmCounts();
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmCountServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmCountServiceImpl.java
new file mode 100644
index 0000000..92c6569
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmCountServiceImpl.java
@@ -0,0 +1,49 @@
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.entity.MdmCount;
+import com.vci.ubcs.code.service.ICodeClassifyService;
+import com.vci.ubcs.code.service.IMdmCountService;
+import com.vci.ubcs.system.feign.ISysClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 涓绘暟鎹粺璁℃湇鍔�
+ * @author ludc
+ * @date 2023/10/16 15:47
+ */
+@Slf4j
+@Service
+public class MdmCountServiceImpl implements IMdmCountService {
+
+ /**
+ * 绯荤粺鏈嶅姟
+ */
+ @Resource
+ private ISysClient sysClient;
+
+ @Resource
+ private ICodeClassifyService codeClassifyService;
+
+ @Override
+ public List<MdmCount> getMdmCounts() {
+ // 1銆侀渶瑕佸厛鏌ヨ鍑哄垎绫讳笅椤剁骇鑺傜偣鏈夊摢浜涗富鏁版嵁,鎷垮埌涓氬姟绫诲瀷鍚嶇О
+ LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query()
+ .lambda()
+ .isNull(CodeClassify::getParentCodeClassifyOid).select(CodeClassify::getBtmTypeId);
+ Map<String, Object> map = codeClassifyService.getMap(wrapper);
+ // 2銆佺劧鍚庨渶瑕佹煡璇㈠嚭鑿滃崟璺敱鍜屽浘鏍�
+
+ // 3銆佺劧鍚庤缃繘
+
+ return null;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index f7ad297..5acd73f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -102,7 +102,7 @@
public boolean submit(Strategy strategy) {
//鑰佺殑榛樿瀵嗙爜绛栫暐
Long oldIsDefaultStrategy = null;
- //鍒ゆ柇鏄惁鎼哄甫id
+ //鍒ゆ柇鏄惁鎼哄甫id锛屼笉鎼哄甫id涓烘柊澧炴搷浣�
if(Func.isEmpty(strategy.getId())){
//鎵ц鏂板
Strategy dbstrategy = this.getOne(Wrappers.<Strategy>query().lambda()
@@ -132,13 +132,18 @@
//妫�楠屽瘑鐮佺瓥鐣ユ槸鍚︾鍚堣姹�
checkPwdStrategy(strategy);
//濡傛灉褰撳墠淇敼璁剧疆涓洪粯璁ゅ瘑鐮佺瓥鐣ワ紝闇�瑕佸皢宸插瓨鍦ㄩ粯璁ゅ瘑鐮佺瓥鐣ヤ慨鏀逛负闈為粯璁�
- if(strategy.getIsDefault().equals("1") || strategy.getIsDefault() == 1){
+ if((strategy.getIsDefault().toString()).equals("1")){
//鏌ヨ鑰佺殑榛樿瀵嗙爜绛栫暐锛屼究浜庝笅闈慨鏀�
- oldIsDefaultStrategy = this.queryByIsDefault().getId();
- this.update(Wrappers.<Strategy>update().lambda()
- .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
- .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
+ Strategy strategyDefault = this.queryByIsDefault();
+ // 鍦ㄦ暟鎹笉鍑虹幇闂鐨勬儏鍐典笅涓嶄細鍑虹幇strategyDefault涓虹┖鐨勬儏鍐�
+ if(Func.isNotEmpty(strategyDefault)){
+ oldIsDefaultStrategy = strategyDefault.getId();
+ this.update(Wrappers.<Strategy>update().lambda()
+ .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
+ .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
+ }
}else {
+ // 閬垮厤鐢ㄦ埛灏嗗敮涓�鐨勯粯璁ゅ瘑鐮佺瓥鐣ユ敼涓洪潪榛樿
if(Func.isEmpty(queryByIsDefault())){
throw new ServiceException("榛樿瀵嗙爜绛栫暐蹇呴』鏈変笖浠呮湁涓�鏉�!");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 6cc6556..6de7864 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -526,6 +526,9 @@
pwdupdateday = dateToDay(pwdUpdateTime);
}
Strategy strategy = sysClient.getByUserId(userId).getData();
+ if(Func.isNotEmpty(strategy)){
+ throw new ServiceException("瀵嗙爜绛栫暐鏌ヨ涓虹┖锛岃妫�鏌ュ綋鍓嶇鎴蜂笅鏄惁瀛樺湪榛樿瀵嗙爜绛栫暐锛�");
+ }
//鏄惁鎻愰啋閫氳繃鏈�鍚庝竴娆′慨鏀瑰瘑鐮佺殑鏃堕棿鍔犱笂杩囨湡鏃堕棿鍑忓幓褰撳墠鏃堕棿锛屽鏋滃皬浜庤繃鏈熸彁閱掓椂闂村氨杩涜鎻愰啋锛屽鏋�<=0灏辨彁閱掑繀椤讳慨鏀瑰瘑鐮�
long reminder = pwdupdateday+strategy.getExpirationTime()-dateToDay(new Date());
//鎻愰啋鐢ㄦ埛蹇呴』淇敼瀵嗙爜
--
Gitblit v1.9.3