Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -111,7 +111,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                     return userEntity;
                 }
             } catch (Exception e) {
-                log.error("解析jwt token异常！", e);
+                log.error("解析jwt token异常！,token:{}",token, e);
                 return null;
             }
         }

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -74,7 +74,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
         //判断是否存在设备编码。存在 查询设备编码应用黑名单
         checkDeviceBlackApp(params, list);
         //根据指定的idlist顺序进行排序
-        sortAppByIdList(params, list);
+        //sortAppByIdList(params, list);
         String domainUrl = "";
         if (!ObjectUtils.isEmpty(params.getServerName()) && Validator.isIpv4(params.getServerName())) {
             domainUrl = String.format("http://%s:%d", params.getServerName(), params.getServerPort() > 0 ? params.getServerPort() : 11078);
@@ -116,6 +116,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
 
     private void sortAppByIdList(AppEntity params, List<AppEntity> list) {
         if (!ObjectUtils.isEmpty(params.getIdList())) {
+
             log.info("请求的排序id列表:{}", JSON.toJSONString(params.getIdList()));
             try {
                 //去除idlist中不存在的

base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessServiceImpl.java

@@ -181,14 +181,6 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
                 Long[] idList = windowBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
                 windowBusinessService.remove(idList, context);
             }
-/*            SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
-            siteBusinessQuery.setBusinessIdList(Arrays.asList(ids));
-            List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(siteBusinessQuery);
-            log.info("remove siteBusinessEntities size:{}", siteBusinessEntities.size());
-            if (!ObjectUtils.isEmpty(siteBusinessEntities)) {
-                Long[] idList = siteBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
-                siteBusinessService.remove(idList, context);
-            }*/
         }
     }
 

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

@@ -221,7 +221,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
     }
 
     private void pushChangeMsg(Long windowId) {
-        // log.info("pushChangeMsg:{}", JSON.toJSONString(windowId));
         String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
         phpUrl += "/api/window/winNameChange";
         HashMap<String, Object> paramsMap = new HashMap<>();

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -80,9 +80,6 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         } else {
             entity.setLoginPwd(null);
         }
-
-
-        //判断党员是否其它选项，如果
     }
 
     @Override
@@ -111,9 +108,6 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         } catch (Exception e) {
             throw new AppException("密码验认出错！", e);
         }
-//        WorkmanEntity update = new WorkmanEntity();
-//        update.setId(workmanEntity.getId());
-//        this.dao.update(update);
         return workmanEntity;
     }