From a9674f2fdd767d37a920e08535d8ab7d88746796 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 十二月 2023 14:21:52 +0800
Subject: [PATCH] bug修改

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java    |   44 +++++++++++++---------
 ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java                     |    2 
 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java |   32 +++++++++++++--
 ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml     |    2 
 4 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index e151ebd..f07dc5a 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -141,7 +141,7 @@
             date = calendar.getTime();
             umsAdmin.setExpirationDate(date);
         } else {
-            umsAdmin.setExpirationDate(new Date(2090,1,1));
+            umsAdmin.setExpirationDate(new Date(2090, 1, 1));
         }
         if (umsAdmin.getId() != null) {
             baseMapper.updateById(umsAdmin);
@@ -298,7 +298,7 @@
         }
         return token;
     }
-	
+
     @Override
     public String getOAuthToken(String username) {
         String token = null;
@@ -587,23 +587,31 @@
 
     @Override
     public List<UmsAdmin> getDepartUser(Long departId) {
-        //TODO锛氭煡璇簩绾ч儴闂ㄥ強鎵�鏈夊瓙绾ч儴闂�
-        List<UmsDepart> umsDeparts = umsDepartManageMapper.selectChildrendIds(departId);
-        List<Long> parentIds = umsDeparts.stream().map(UmsDepart::getParentId).collect(Collectors.toList());
-        List<Long> ids = umsDeparts.stream().map(UmsDepart::getId).collect(Collectors.toList());
-        List<Long> departIds = new ArrayList<>();
-        for (Long id : ids) {
-            if(!parentIds.contains(id)){
-                departIds.add(id);
-            }
-        }
-
+//        //TODO锛氭煡璇簩绾ч儴闂ㄥ強鎵�鏈夊瓙绾ч儴闂�
+//        List<UmsDepart> umsDeparts = umsDepartManageMapper.selectChildrendIds(departId);
+//        List<Long> parentIds = umsDeparts.stream().map(UmsDepart::getParentId).collect(Collectors.toList());
+//        List<Long> ids = umsDeparts.stream().map(UmsDepart::getId).collect(Collectors.toList());
+//        List<Long> departIds = new ArrayList<>();
+//        for (Long id : ids) {
+//            if(!parentIds.contains(id)){
+//                departIds.add(id);
+//            }
+//        }
+//
+//        QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
+//        wrapper.lambda().in(UmsDepartManage::getDepartId, departIds);
+//        List<UmsDepartManage> users = umsDepartManageMapper.selectList(wrapper);
+//
+//        List<Long> userIds = users.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
+//
+//        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
+//        wrapperUser.in("id", userIds);
+//        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
+//        return adminList;
         QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
-        wrapper.lambda().in(UmsDepartManage::getDepartId, departIds);
-        List<UmsDepartManage> users = umsDepartManageMapper.selectList(wrapper);
-
-        List<Long> userIds = users.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
-
+        wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
+        List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
+        List<Long> userIds = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
         QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
         wrapperUser.in("id", userIds);
         List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index 40068e6..02babf2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -23,6 +23,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -120,12 +121,28 @@
     public byte[] getImages(HttpServletRequest request, HttpServletResponse response,
                             @RequestParam String fileUrl, @RequestParam(required = false) String OSSAccessKeyId,
                             @RequestParam(required = false) String Signature) {
-        String sessionId = request.getSession().getId();
-        sessionDic.put(sessionId, 0);
-        return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
-
+        if (StringUtils.isNotBlank(fileUrl)) {
+            String sessionId = request.getSession().getId();
+            sessionDic.put(sessionId, 0);
+            return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+        } else {
+            return null;
+        }
     }
 
+    @ApiOperation(value = "鑾峰彇鍥剧墖")
+    @GetMapping(value = "/img/base64")
+//    @GetMapping(value = "/img")
+    @ResponseBody
+    public String getImagesBase64(HttpServletRequest request, HttpServletResponse response,
+                                  @RequestParam String fileUrl, @RequestParam(required = false) String OSSAccessKeyId,
+                                  @RequestParam(required = false) String Signature) {
+        String sessionId = request.getSession().getId();
+        sessionDic.put(sessionId, 0);
+        byte[] bytes = getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+        String base64 = DatatypeConverter.printBase64Binary(bytes);
+        return base64;
+    }
 
     @GetMapping(value = "/index")
     @ResponseBody
@@ -141,7 +158,12 @@
                 sessionDic.remove(sessionId);
                 fileUrl = fileUrl.replace("Expires", "v");
                 System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
-                URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+                URL url = null;
+                if (StringUtils.isNotBlank(OSSAccessKeyId) && StringUtils.isNotBlank(Signature)) {
+                    url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+                } else {
+                    url = new URL(fileUrl);
+                }
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                 conn.setRequestMethod("GET");
                 conn.setConnectTimeout(10 * 1000);
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
index 8ce0c7f..7ae7888 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
@@ -91,7 +91,7 @@
 //            runAction();
         }
     }
-    @Scheduled(cron ="0 0/2 * * * ? ")
+//    @Scheduled(cron ="0 0/2 * * * ? ")
     public void runAction() {
          //gettoken
          String getToken = getToken();
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
index 82e4f26..9edff58 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
@@ -83,7 +83,7 @@
         FROM
         ums_dispose_record t2
         LEFT JOIN ums_base_case t3 ON t2.base_case_id = t3.id
-        inner join ums_sccg_region t5 on t5.id = t3.community_id
+        LEFT join ums_sccg_region t5 on t5.id = t3.community_id
         <where>
             t2.handler_id = #{id}
             AND t2.state = 0

--
Gitblit v1.8.0