v3.9.0版本合并commit

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-system-api</artifactId>
         <groupId>org.jeecgframework.boot3</groupId>
-        <version>3.8.3</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -5,6 +5,7 @@ import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
+import org.jeecg.common.api.dto.PushMessageDTO;
 import org.jeecg.common.api.dto.message.*;
 import org.jeecg.common.constant.ServiceNameConstants;
 import org.jeecg.common.constant.enums.DySmsEnum;
@@ -629,7 +630,6 @@ public interface ISysBaseAPI extends CommonAPI {
     @GetMapping("/sys/api/translateManyDict")
     Map<String, List<DictModel>> translateManyDict(@RequestParam("dictCodes") String dictCodes, @RequestParam("keys") String keys);
 
-    //update-begin---author:chenrui ---date:20231221  for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
     /**
      * 49 字典表的 翻译，可批量
      * @param table
@@ -642,7 +642,6 @@ public interface ISysBaseAPI extends CommonAPI {
     @Override
     @GetMapping("/sys/api/translateDictFromTableByKeys")
     List<DictModel> translateDictFromTableByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keys") String keys, @RequestParam("ds") String ds);
-    //update-end---author:chenrui ---date:20231221  for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
 
     /**
      * 发送模板消息
@@ -747,7 +746,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @return
      */
     @GetMapping("/sys/api/queryUserIdsByDeptIds")
-    List<String> queryUserIdsByDeptIds(List<String> deptIds);
+    List<String> queryUserIdsByDeptIds(@RequestParam("deptIds") List<String> deptIds);
 
     /**
      * 根据部门ID查询用户账号
@@ -755,7 +754,7 @@ public interface ISysBaseAPI extends CommonAPI {
      * @return
      */
     @GetMapping("/sys/api/queryUserAccountsByDeptIds")
-    List<String> queryUserAccountsByDeptIds(List<String> deptIds);
+    List<String> queryUserAccountsByDeptIds(@RequestParam("deptIds") List<String> deptIds);
     
     /**
      * 根据角色编码 查询用户ID
@@ -763,10 +762,34 @@ public interface ISysBaseAPI extends CommonAPI {
      * @return
      */
     @GetMapping("/sys/api/queryUserIdsByRoleds")
-    List<String> queryUserIdsByRoleds(List<String> roleCodes);
+    List<String> queryUserIdsByRoleds(@RequestParam("roleCodes") List<String> roleCodes);
 
     /**
-     * 根据职务ID查询用户ID
+     * 根据用户ID查询用户名称
+     * @param userIds
+     * @return
+     */
+    @GetMapping("/sys/api/queryUsernameByIds")
+    List<String> queryUsernameByIds(@RequestParam("userIds") List<String> userIds);
+
+    /**
+     * 根据部门岗位ID查询用户ID
+     * @param deptPostIds
+     * @return
+     */
+    @GetMapping("/sys/api/queryUserIdsByDeptPostIds")
+    public List<String> queryUserIdsByDeptPostIds(@RequestParam("deptPostIds") List<String> deptPostIds);
+
+    /**
+     * 根据部门主岗位和兼职岗位，查询用户账号
+     * @param positionIds
+     * @return
+     */
+    @GetMapping("/sys/api/queryUsernameByDepartPositIds")
+    List<String> queryUsernameByDepartPositIds(@RequestParam("departPositIds") List<String> positionIds);
+    
+    /**
+     * 根据职务ID查询用户账号
      * @param positionIds
      * @return
      */
@@ -868,7 +891,14 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     @GetMapping("/sys/api/queryUserIdsByCascadeDeptIds")
     List<String> queryUserIdsByCascadeDeptIds(@RequestParam("deptIds") List<String> deptIds);
-
+    /**
+     * 根据用户信息推送移动端Push消息
+     * @param pushMessageDTO
+     * @return
+     */
+    @PostMapping("/sys/api/uniPushMsgToUser")
+    void uniPushMsgToUser(@RequestBody PushMessageDTO pushMessageDTO);
+   
     @GetMapping("/sys/api/getUserByPhone")
     public LoginUser getUserByPhone(@RequestParam("phone") String phone);
 
@@ -883,4 +913,5 @@ public interface ISysBaseAPI extends CommonAPI {
 
     @GetMapping("/sys/api/setLoginTenant")
     JSONObject setLoginTenant(@RequestParam("username") String username);
+
 }

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
+import org.jeecg.common.api.dto.PushMessageDTO;
 import org.jeecg.common.api.dto.message.*;
 import org.jeecg.common.constant.enums.DySmsEnum;
 import org.jeecg.common.constant.enums.EmailTemplateEnum;
@@ -312,12 +313,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
-    //update-begin---author:chenrui ---date:20231221  for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
+    // 代码逻辑说明: [issues/#5643]解决分布式下表字典跨库无法查询问题------------
     @Override
     public List<DictModel> translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource) {
         return null;
     }
-    //update-end---author:chenrui ---date:20231221  for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
 
     @Override
     public void sendTemplateMessage(MessageDTO message) {
@@ -441,6 +441,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public List<String> queryUserIdsByDeptPostIds(List<String> deptPostIds) {
+        return List.of();
+    }
+
     @Override
     public List<String> queryUserAccountsByDeptIds(List<String> deptIds) {
         return null;
@@ -451,6 +456,16 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public List<String> queryUsernameByIds(List<String> userIds) {
+        return List.of();
+    }
+
+    @Override
+    public List<String> queryUsernameByDepartPositIds(List<String> positionIds) {
+        return null;
+    }
+
     @Override
     public List<String> queryUserIdsByPositionIds(List<String> positionIds) {
         return null;
@@ -491,6 +506,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public void uniPushMsgToUser(PushMessageDTO pushMessageDTO) {
+
+    }
+
     @Override
     public String getDepartPathNameByOrgCode(String orgCode, String depId) {
         return "";

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java

@@ -137,7 +137,6 @@
 //        return new SpringFormEncoder(new SpringEncoder(messageConverters));
 //    }
 //
-//    // update-begin--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
 //    /**
 //     * 给 Feign 添加 FastJson 的解析支持
 //     */
@@ -175,6 +174,6 @@
 //
 //        return converter;
 //    }
-//    // update-end--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
+//    
 //
 //}