From 41f751b5a4931aaef3909f610532a1d3efd8cd93 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 15 Mar 2024 11:17:09 +0800 Subject: [PATCH] =?UTF-8?q?#E10-06#=20=E4=BC=98=E5=8C=96=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HrmSelfHelpController.java | 80 ------------------- .../controller/JucailinPortalController.java | 51 ++++-------- 2 files changed, 17 insertions(+), 114 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java index 64e36e2..3d256de 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import sun.misc.BASE64Decoder; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -176,85 +175,6 @@ public class HrmSelfHelpController { } - @GetMapping("/testSapi4") - @WeaPermission(publicPermission = true) - public WeaResult testSapi4(HttpServletRequest request){ - - String urlip = request.getParameter("urlip") ; - String urlpath = request.getParameter("urlpath") ; - - log.error("urlip41:"+urlip); - log.error("urlpath41:"+urlpath); - - BASE64Decoder decoder = new BASE64Decoder(); - try { - if(StringUtils.isNotBlank(urlip)){ - urlip = new String(decoder.decodeBuffer(urlip),"UTF-8"); - } - log.error("urlip42:"+urlip); - - if(StringUtils.isNotBlank(urlpath)){ - urlpath = new String(decoder.decodeBuffer(urlpath),"UTF-8"); - } - log.error("urlpath42:"+urlpath); - - } catch (IOException e) { - e.printStackTrace(); - } - - - String beginDate = request.getParameter("beginDate") ; - String endDate = request.getParameter("endDate") ; - String userId = request.getParameter("userId") ; - String request_cookie = "" ; - - Cookie[] cookies = request.getCookies(); - for (Cookie cookie:cookies){ - //判断携带的cookie是否正确 - String cookiename = cookie.getName(); - String cookievalue = cookie.getValue(); - - log.error("cookiename4:"+cookiename); - log.error("cookievalue4:"+cookievalue); - - request_cookie += StringUtils.isBlank(request_cookie) ? cookiename+"="+cookievalue : "; "+cookiename+"="+cookievalue ; - - } - - log.error("request_cookie4:"+request_cookie); - log.error("4444444444444444"); - - JSONObject jsonObject = new JSONObject(); - - try { - String content = "{\"beginDate\": \""+beginDate+"\", \"endDate\": \""+endDate+"\", \"userId\": \""+userId+"\"}" ; - - log.error("content4:"+content); - OkHttpClient client = new OkHttpClient().newBuilder().build(); - MediaType mediaType = MediaType.parse("application/json"); - RequestBody body = RequestBody.create(mediaType, content); - Request request3 = new Request.Builder() - .url(urlip+urlpath) - .method("POST", body) - .addHeader("Cookie", request_cookie) - .addHeader("Content-Type", "application/json") - .build(); - Response response = client.newCall(request3).execute(); - String data = response.body().toString(); - log.error("data4:"+data); - if(StringUtils.isNotBlank(data)){ - jsonObject = JSONObject.parseObject(data); - } - } catch (IOException e) { - e.printStackTrace(); - log.error("testSapi4-e:"+e); - } - log.error("jsonObject4:"+jsonObject.toString()); - - return WeaResult.success(jsonObject.toString()); - } - - @GetMapping("/testSapi5") @WeaPermission(publicPermission = true) public WeaResult testSapi5(HttpServletRequest request){ diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java index 5376b34..fb7fb22 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java @@ -48,13 +48,12 @@ public class JucailinPortalController { @GetMapping("/getPortalUser") @WeaPermission(publicPermission = true) public WeaResult getPortalUser(HttpServletRequest request){ - log.error("getPortalUser"); Map recordMap = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); - try{ recordMap = jucailinPortalService.getPortalUserData(simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalUser-Exception:"+e); } return WeaResult.success(recordMap); @@ -68,17 +67,13 @@ public class JucailinPortalController { @GetMapping("/getPortalAttendance") @WeaPermission(publicPermission = true) public WeaResult getPortalAttendance(HttpServletRequest request){ - log.error("getPortalAttendance"); - Map recordMap = new HashMap(); - Long employeeId = UserContext.getCurrentEmployeeId(); - SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); - try{ recordMap = jucailinPortalService.getPortalAttendanceData(simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("testSapi-Exception:"+e); } @@ -89,17 +84,13 @@ public class JucailinPortalController { @GetMapping("/getPortalPerformance") @WeaPermission(publicPermission = true) public WeaResult getPortalPerformance(HttpServletRequest request){ - log.error("getPortalPerformance"); - Map recordMap = new HashMap(); - Long employeeId = UserContext.getCurrentEmployeeId(); - SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); - try{ recordMap = jucailinPortalService.getPortalPerformanceData(simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("testSapi-Exception:"+e); } @@ -116,15 +107,12 @@ public class JucailinPortalController { @GetMapping("/getPortalBirthdayWishes") @WeaPermission(publicPermission = true) public WeaResult getPortalBirthdayWishes(HttpServletRequest request){ - log.error("getPortalBirthdayWishes"); - Map recordMap = new HashMap(); - SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); - try{ recordMap = jucailinPortalService.getPortalBirthdayWishes(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalBirthdayWishes-Exception:"+e); } @@ -140,15 +128,12 @@ public class JucailinPortalController { @GetMapping("/getPortalRiskInfo") @WeaPermission(publicPermission = true) public WeaResult getPortalRiskInfo(HttpServletRequest request){ - log.error("getPortalRiskInfo"); - Map recordMap = new HashMap(); - SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); - try{ recordMap = jucailinPortalService.getPortalRiskInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalRiskInfo-Exception:"+e); } @@ -164,13 +149,12 @@ public class JucailinPortalController { @GetMapping("/getPortalPerformanceInfo") @WeaPermission(publicPermission = true) public WeaResult getPortalPerformanceInfo(HttpServletRequest request){ - log.error("getPortalPerformanceInfo"); - Map recordMap = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); try{ recordMap = jucailinPortalService.getPortalPerformanceInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalPerformanceInfo-Exception:"+e.getMessage()); } @@ -225,7 +209,6 @@ public class JucailinPortalController { } }catch (Exception e){ log.error("getWorkFlowInfo-Exception:"+e.getMessage()); - return WeaResult.fail(500,"程序执行异常"); } return WeaResult.success(requestListInfoPAEntityList); } @@ -238,7 +221,6 @@ public class JucailinPortalController { @GetMapping("/getWorkFlowInfoCount") @WeaPermission(publicPermission = true) public WeaResult getWorkFlowInfoCount(HttpServletRequest request){ - log.error("getWorkFlowInfoCount"); RequestCountInfoPAEntity RequestCountInfoPAEntity = new RequestCountInfoPAEntity(); try{ @@ -276,7 +258,6 @@ public class JucailinPortalController { } }catch (Exception e){ log.error("getWorkFlowInfoCount-Exception:"+e.getMessage()); - return WeaResult.fail(500,"程序执行异常"); } return WeaResult.success(RequestCountInfoPAEntity); } @@ -296,6 +277,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getPortalInteractCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalInteractCount-Exception:"+e.getMessage()); } @@ -317,6 +299,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getPortalDocCreateCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalDocCreateCount-Exception:"+e.getMessage()); } @@ -339,6 +322,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getPortalWfDealCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalWfDealCount-Exception:"+e.getMessage()); } @@ -360,6 +344,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getPortalDailyCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalDailyCount-Exception:"+e.getMessage()); } @@ -382,6 +367,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getPortalCollaborationInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPortalCollaborationInfo-Exception:"+e.getMessage()); } @@ -405,6 +391,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getProjectAcceptanceInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPorojectAcceptanceInfo-Exception:"+e.getMessage()); } @@ -427,6 +414,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getProjectReceiptsInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPorojectReceiptsInfo-Exception:"+e.getMessage()); } @@ -442,13 +430,13 @@ public class JucailinPortalController { @GetMapping("/getPorojectCollaborationInfo") @WeaPermission(publicPermission = true) public WeaResult getPorojectCollaborationInfo(HttpServletRequest request){ - log.error("getPorojectCollaborationInfo"); Map recordMap = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); try{ recordMap = jucailinPortalService.getProjectCollaborationInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getPorojectCollaborationInfo-Exception:"+e.getMessage()); } @@ -471,6 +459,7 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getDevQuestCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getDevQuestCount-Exception:"+e.getMessage()); } @@ -486,13 +475,13 @@ public class JucailinPortalController { @GetMapping("/getDevDaysCount") @WeaPermission(publicPermission = true) public WeaResult getDevDaysCount(HttpServletRequest request){ - log.error("getDevDaysCount"); Map recordMap = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); try{ recordMap = jucailinPortalService.getDevDaysCount(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getDevDaysCount-Exception:"+e.getMessage()); } @@ -515,17 +504,11 @@ public class JucailinPortalController { try{ recordMap = jucailinPortalService.getDevCollaborationInfo(request,simpleEmployee); }catch (Exception e){ + recordMap.put("errorCode","exception"); log.error("getDevCollaborationInfo-Exception:"+e.getMessage()); } return WeaResult.success(recordMap); } - - - - - - - }