From 419edc6f9f102cfc63503a0f5588484fe200f795 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Thu, 19 Mar 2026 11:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/ShareQrUtils.java | 27 +++++++++++++++++++ .../config/mybatis/MybatisInterceptor.java | 13 +++++++-- .../system/controller/LoginController.java | 12 +++++++++ .../modules/system/entity/SysTenant.java | 21 +++++++++++++++ .../jeecg/modules/system/entity/SysUser.java | 24 +++++++++++++++++ .../controller/BigScreenController.java | 2 +- .../controller/SurvMulchRecordController.java | 2 ++ .../service/impl/IotCommonServiceImpl.java | 2 +- 8 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShareQrUtils.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShareQrUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShareQrUtils.java new file mode 100644 index 0000000..563e448 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ShareQrUtils.java @@ -0,0 +1,27 @@ +package org.jeecg.common.util; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class ShareQrUtils { + + @Value("${domain.domain}") + private String domain; + + + /** + * 拼接静态地址 + */ + public String completeStaticUrl(String url) { + if (StringUtils.isNotBlank(url)) { + if(url.contains("http")){ + return url; + }else{ + return domain + "/sys/common/static/" + url; + } + } + return url; + } +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index 90cca20..038523d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -1,6 +1,7 @@ package org.jeecg.config.mybatis; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.binding.MapperMethod.ParamMap; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.MappedStatement; @@ -88,13 +89,21 @@ public class MybatisInterceptor implements Interceptor { //------------------------------------------------------------------------------------------------ //注入租户ID（是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】） if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { + log.error(field.getName()+"=============checkOne============"+TenantContext.getTenant()); if (TenantConstant.TENANT_ID.equals(field.getName())) { field.setAccessible(true); Object localTenantId = field.get(parameter); + log.error(field.getName()+"xxxlocalTenantIdxxxx"+parameter); field.setAccessible(false); - if (localTenantId == null) { + if (localTenantId == null || StringUtils.isBlank(localTenantId.toString())) { field.setAccessible(true); - field.set(parameter, oConvertUtils.getInt(TenantContext.getTenant(),0)); + + if (field.getType() == String.class) { + field.set(parameter, oConvertUtils.getString(TenantContext.getTenant(),"0")); + log.error("checkC============"+field.get(parameter)); + }else{ + field.set(parameter, oConvertUtils.getInt(TenantContext.getTenant(),0)); + } field.setAccessible(false); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 4a3da3b..6a428db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -22,6 +22,7 @@ import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.entity.SysTenant; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.model.SysLoginModel; import org.jeecg.modules.system.service.*; @@ -68,6 +69,9 @@ public class LoginController { @Autowired private JeecgBaseConfig jeecgBaseConfig; + @Autowired + private ShareQrUtils shareQrUtils; + private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; @ApiOperation("登录接口") @@ -460,6 +464,14 @@ public class LoginController { return loginTenantError; } + SysTenant sysTenant = sysTenantService.getById(sysUser.getLoginTenantId()); + if(sysTenant!=null){ + sysUser.setLoadingName(sysTenant.getLoadingName()); + sysUser.setSystemName(sysTenant.getSystemName()); + sysUser.setAppLogoName(sysTenant.getAppLogoName()); + sysUser.setAptImage(shareQrUtils.completeStaticUrl(sysTenant.getAptImage())); + } + //3.设置登录用户信息 obj.put("userInfo", sysUser); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java index 169f3de..c9d56bc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -132,5 +133,25 @@ public class SysTenant implements Serializable { * 允许申请管理员 1允许 0不允许 */ private Integer applyStatus; + + /** + * 左上logo名称 + */ + private String appLogoName; + + /** + * 中上系统名称 + */ + private String systemName; + + /** + * loadingName + */ + private String loadingName; + + /** + * 小程序图片 + */ + private String aptImage; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 26a93ac..53d8522 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -201,4 +201,28 @@ public class SysUser implements Serializable { * 流程状态 */ private String bpmStatus; + + /** + * 左上logo名称 + */ + @TableField(exist = false) + private String appLogoName; + + /** + * 中上系统名称 + */ + @TableField(exist = false) + private String systemName; + + /** + * loadingName + */ + @TableField(exist = false) + private String loadingName; + + /** + * 小程序图片 + */ + @TableField(exist = false) + private String aptImage; } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index ccc9613..5f9a346 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -634,7 +634,7 @@ public class BigScreenController { // remainList.add(survDeviceDeploy); } } - + log.error("step============="+waterIdList.size()); //查询五常数据 ScreenIndexSummaryDetailVo waterQuality = commonP2Service.processWaterQuality(screenSummaryVo,waterIdList,startTime,endTime); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvMulchRecordController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvMulchRecordController.java index 7964d67..59aa17b 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvMulchRecordController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvMulchRecordController.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.config.TenantContext; import org.jeecg.common.entity.SurvMulchRecord; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.util.JwtUtil; @@ -69,6 +70,7 @@ public class SurvMulchRecordController extends JeecgController add(@RequestBody SurvMulchRecord survMulchRecord,HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); +// survMulchRecord.setTenantId(TenantContext.getTenant()); survMulchRecord.setCreatedBy(username); survMulchRecord.setCreateTime(new Date()); survMulchRecordService.save(survMulchRecord); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java index 804f375..82d929a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java @@ -148,7 +148,7 @@ public class IotCommonServiceImpl { } } } - + log.error("wtf========"+deploys.size()); //无设备直接返回 if(CollectionUtils.isEmpty(deploys)){ return result;