From 1738593e6df795389747c53b15d136ea85b0f03d Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 21 八月 2023 10:50:54 +0800
Subject: [PATCH] mobile
---
src/main/java/com/product/mobile/core/service/NavBarManagerService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/NavBarManagerService.java b/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
index e847074..06638ca 100644
--- a/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
+++ b/src/main/java/com/product/mobile/core/service/NavBarManagerService.java
@@ -1,5 +1,6 @@
package com.product.mobile.core.service;
+import cn.hutool.core.io.FileUtil;
import com.product.common.lang.StringUtils;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -14,7 +15,9 @@
import com.product.mobile.core.service.ide.INavBarManagerService;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
+import com.product.util.sf.img4.util.ImageUtil;
import org.apache.commons.codec.binary.Base64;
+import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -135,7 +138,7 @@
sql.append(" a.nav_bar_name, ");
sql.append(" a.module_category, ");
sql.append(" b.route_name, ");
- sql.append(" concat( '/', b.uuid ) path, ");
+ sql.append(" concat( '/', b.uuid ) path, ");
sql.append(" a.uuid, ");
sql.append(" a.sequence,a.module_sequence ");
sql.append(" FROM ");
@@ -157,8 +160,9 @@
sql.append(" a.nav_bar_name, ");
sql.append(" a.module_category, ");
sql.append(" a.uuid ,");
+ sql.append(" concat( '/', b.uuid ) ,");
sql.append(" a.sequence, ");
- sql.append(" b.route_name ");
+ sql.append(" b.route_name,a.module_sequence ");
sql.append(" order by a.module_sequence,a.sequence");
DataTableEntity dt = getBaseDao().listTable(sql.toString(), new Object[]{});
if (!DataTableEntity.isEmpty(dt)) {
@@ -173,6 +177,11 @@
String file_uuid = dt.getString(i, MobileCoreConst.NAV_BAR_IMG);
try {
byte[] fileContent = fileManagerService.getFileContent(file_uuid);
+ if(fileContent==null || fileContent.length==0){
+ dt.setFieldValue(i, MobileCoreConst.NAV_BAR_IMG, null);
+ navBarEntities.add(new NavBarEntity(dt.getFieldSetEntity(i)));
+ continue;
+ }
String bytes = Base64.encodeBase64String(fileContent);
dt.setFieldValue(i, MobileCoreConst.NAV_BAR_IMG, bytes);
} catch (Exception e) {
--
Gitblit v1.9.2