From 38b3548433f54e9e13583f7c51d8512b0a9021cf Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 22 九月 2023 08:59:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/api/integration/sysInfo.js | 8 ++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java | 3 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 14 +++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml | 2
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 25 +++++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java | 23 +++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 6 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java | 14 +++---
9 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/integration/sysInfo.js b/Source/UBCS-WEB/src/api/integration/sysInfo.js
index 9090647..17bc628 100644
--- a/Source/UBCS-WEB/src/api/integration/sysInfo.js
+++ b/Source/UBCS-WEB/src/api/integration/sysInfo.js
@@ -44,3 +44,11 @@
params: params
})
}
+// 鍒嗙被鎺堟潈
+export const batchAddSave = (params) => {
+ return request({
+ url: '/api/ubcs-code/codeApplyWebManagementController/batchAddSave',
+ method: 'post',
+ params: params
+ })
+}
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index bd3103f..a6b21e5 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -24,7 +24,7 @@
</template>
</avue-crud>
- <el-dialog :visible.sync="dialogVisible" append-to-body class="avue-dialog avue-dialog--top" title="鍒嗙被鎺堟潈" top="-10">
+ <el-dialog :visible.sync="dialogVisible" append-to-body class="avue-dialog avue-dialog--top" title="鍒嗙被鎺堟潈" top="-50px">
<el-row>
<el-col :span="10">
@@ -37,18 +37,19 @@
</el-col>
</el-row>
<div slot="footer" class="dialog-footer" style="height: 50px;line-height: 50px">
- <el-button type="primary" icon="el-icon-plus" size="small">鎺� 鏉�</el-button>
+ <el-button type="primary" icon="el-icon-plus" size="small" @click="empower">鎺� 鏉�</el-button>
<el-button icon="el-icon-close" size="small" type="danger">閲� 缃�</el-button>
</div>
</el-dialog>
</basic-container>
</template>
<script>
-import {getSysInfoList, sysInfoAdd, sysInfoEdit, sysInfoDel, sysInfoTree} from '@/api/integration/sysInfo.js'
+import {getSysInfoList, sysInfoAdd, sysInfoEdit, sysInfoDel, sysInfoTree,batchAddSave} from '@/api/integration/sysInfo.js'
export default {
data() {
return {
+ checkAll:[],
//閬垮厤缂撳瓨
reload: Math.random(),
TreeLoading: false,
@@ -127,12 +128,18 @@
},
methods: {
+ empower(){
+ batchAddSave({systemOid: this.checkAll.oid, systemId: this.checkAll.id}).then(res=>{
+ console.log(res)
+ })
+ },
//鍒嗙被鎺堟潈澶氶�夊洖璋�
checkChange(row,checked) {
- // console.log(row)
- // if(checked){
- //
- // }
+ if(checked){
+ // console.log('row',row)
+ this.checkAll.push(row);
+ console.log('checkAll',this.checkAll)
+ }
},
//鍒嗙被鎺堟潈
classifyHandler(row) {
@@ -266,9 +273,7 @@
},
// enter鎼滅储
handleEnter() {
- if (this.search[this.selectValue] === '') return
- else this.getDataList()
-
+ this.getDataList()
},
// 杈撳叆妗嗘竻绌�
handleClear() {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
index 21edf3b..445c0b5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
@@ -10,6 +10,7 @@
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
/**
@@ -52,15 +53,37 @@
return R.success("鏌ヨ鎴愬姛");
}
+ /**
+ * 鎺ュ彛绋嬪簭鎺堟潈绠＄悊涓垎绫绘巿鏉冨姛鑳�
+ * @param list 鎺堟潈閫変腑鐨勬暟鎹�
+ * @param systemOid 绯荤粺鐨刼id
+ * @param systemId 绯荤粺鐨刬d
+ * @return
+ */
@PostMapping( "/batchAddSave")
public R batchAddSave(@RequestBody List<SystemClassifyRole> list,String systemOid,String systemId){
return codeApplyWebManagementService.batchAddSave(list,systemOid,systemId);
// return R.success("dddd");
}
+ /**
+ * 缂栫爜鍒嗙被鏍戞煡璇㈡帴鍙�
+ * @param systemOid 绯荤粺鐨刼id
+ * @param systemId 绯荤粺鐨刬d
+ * @return
+ */
@GetMapping("/getSystemClassifyRoleTree")
public List<Tree> getSystemClassifyRoleTree(String systemOid,String systemId){
return codeApplyWebManagementService.getSystemClassifyRoleTree(systemOid,systemId);
}
+ /**
+ * 缂栫爜鍒嗙被鏍戞煡璇㈡帴鍙�
+ * @param paramMap systemOid绯荤粺鐨刼id,systemId绯荤粺鐨刬d
+ * @return
+ */
+ @GetMapping("/getAuthTree")
+ public List<Tree> getAuthTree(@RequestParam HashMap<String,String> paramMap){
+ return codeApplyWebManagementService.getAuthTree(paramMap);
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index 28beb6c..eb94cfc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -166,5 +166,4 @@
universalInterfaceI.setThreadLocal(threadLocal);
}
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
index 5cb6929..12b129d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/PasswordFreeLoginController.java
@@ -10,10 +10,14 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;
import javax.annotation.Resource;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
@@ -56,19 +60,15 @@
* @throws Exception
*/
@GetMapping("/ssoLogin")
- public String oaSsoLogin(HttpServletRequest request) throws IOException {
+ public String oaSsoLogin(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) throws IOException, ServletException {
String token;
try {
token = passwordFreeLoginService.ssoFreeLogin(request);
}catch (Exception e){
throw new ServiceException("鍗曠偣鐧诲綍鑾峰彇token澶辫触:"+e.getMessage());
}
-// response.setHeader("tokenInfo",token);
-// response.setCharacterEncoding("utf-8");
-// response.setContentType("application/json");
- request.setAttribute("tokenInfo",token);
- //response.sendRedirect(ssoRedirectAddr);
- return "forward:/sso";
+ redirectAttributes.addFlashAttribute("tokenInfo",token);
+ return "redirect:"+ssoRedirectAddr;
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
index 3ea2f51..52a2a80 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java
@@ -5,10 +5,13 @@
import com.vci.ubcs.starter.web.pagemodel.Tree;
import org.springblade.core.tool.api.R;
+import java.util.HashMap;
import java.util.List;
public interface ICodeApplyWebManagementService extends IService<SystemClassifyRole> {
R batchAddSave(List<SystemClassifyRole> list,String systemOid,String systemId);
List<Tree> getSystemClassifyRoleTree(String systemOid, String systemId);
+
+ List<Tree> getAuthTree(HashMap<String, String> paramMap);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
index ca874f0..16c825a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
@@ -17,10 +17,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -87,4 +84,13 @@
});
return tree;
}
+
+ @Override
+ public List<Tree> getAuthTree(HashMap<String, String> paramMap) {
+ QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
+ wrapper.eq("systemOid",paramMap.get("systemOid"));
+ wrapper.eq("systemId",paramMap.get("systemId"));
+
+ return null;
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index 5efd2d9..01aa00c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -168,13 +168,13 @@
@Override
public String ssoFreeLogin(ServletRequest servletRequest) throws Exception {
HttpServletRequest request = (HttpServletRequest) servletRequest;
-// String content = request.getHeader("empCode");
- String content = "test";
+ // String empCode = Func.isEmpty(request.getHeader("empCode")) ? request.getParameter("empCode"):request.getHeader("empCode");
+ String empCode = "test";
// if(Func.isBlank(content)){
// throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
// }
//鍔犲瘑
- String str1 = aesEncrypt(content, clientId);
+ String str1 = aesEncrypt(empCode, clientId);
String str2 = aesEncrypt(str1, secretKey);
String enStr1 = aesDecrypt(str2, secretKey);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
index 8c7470e..7a9e2ce 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
@@ -70,7 +70,7 @@
pc.SYSTEMID,
p.oid CLASSIFYOID,
p.id CLASSIFYID,
- case when pc.selected is null then false else pc.SELECTED end SELECTED,
+ case when pc.selected is null then false when pc.selected = 0 then false else pc.SELECTED end SELECTED,
p.PARENTCODECLASSIFYOID CLASSPARENTOID
from PL_CODE_CLASSIFY p ,
PL_CODE_SYSTEM_CLASSIFY_ROLE pc
--
Gitblit v1.9.3