Merge branch 'dev_v2.2.1' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.1

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -121,7 +121,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
         QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
-        sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds).eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true);
+        sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
+                .eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true)
+                .orderByAsc(SysPrivilege::getSequence);
         List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
         Gson gson = new Gson();
         List<MenuDto> menuDtoList = gson.fromJson(JacksonUtil.parseJson(sysPrivilegeList), new TypeToken<List<MenuDto>>() {
@@ -896,7 +898,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     }
 
     @Override
-    public String getSysIncrCode(SystemCodeEnum type,SysUser requestUser) {
+    public String getSysIncrCode(SystemCodeEnum type, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
         String date = DateUtil.today().replace("-", "");
         String paperNumber = "";

teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/StmmsUtils.java

@@ -97,15 +97,19 @@ public class StmmsUtils {
         map.put("password", validParam(password, null, false, "密码"));
         map.put("role", validParam(String.valueOf(roleValue), null, true, "类型：MARKER、SUBJECT_HEADER"));
         map.put("enable", validParam(enable, true, false, "是否启用"));
-        String result = HttpKit.sendPost(postUrl, getHeaders(schoolId, userSaveUrl), map, null, null, null);
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if (jsonObject.containsKey("updateTime")) {
-            return true;
-        } else {
-            log.warn("用户推送（同步）失败");
+        try {
+            String result = HttpKit.sendPost(postUrl, getHeaders(schoolId, userSaveUrl), map, null, null, null);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if (jsonObject.containsKey("updateTime")) {
+                return true;
+            } else {
+                log.warn("用户推送（同步）失败");
+                return false;
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
             return false;
         }
-//        return false;
     }
 
     /**