zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 合并base改包代码

Browse Source
This commit is contained in:
chenbowen
2025-09-22 15:10:53 +08:00
parent 98d71810a8 386d47fde1
commit 516fdb6fa0
670 changed files with 23530 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/controller/admin/goview/GoViewDataController.java
View File

@@ -8,8 +8,6 @@ import com.zt.plat.module.report.controller.admin.goview.vo.data.GoViewDataRespV
import com.zt.plat.module.report.service.goview.GoViewDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,9 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.Map;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.*;
import static com.zt.plat.framework.common.pojo.CommonResult.success;

5
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/controller/admin/goview/GoViewProjectController.java
View File

@@ -12,12 +12,13 @@ import com.zt.plat.module.report.service.goview.GoViewProjectService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import static com.zt.plat.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;

2
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/dal/dataobject/goview/GoViewProjectDO.java
View File

@@ -1,10 +1,10 @@
package com.zt.plat.module.report.dal.dataobject.goview;
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
/**

3
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/framework/jmreport/config/JmReportConfiguration.java
View File

@@ -1,10 +1,11 @@
package com.zt.plat.module.report.framework.jmreport.config;
import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
import com.zt.plat.framework.common.biz.system.permission.PermissionCommonApi;
import com.zt.plat.framework.security.config.SecurityProperties;
import com.zt.plat.module.report.framework.jmreport.core.service.JmOnlDragExternalServiceImpl;
import com.zt.plat.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl;
import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
import com.zt.plat.module.system.api.permission.PermissionApi;
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;

5
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
View File

@@ -2,8 +2,6 @@ package com.zt.plat.module.report.framework.jmreport.core.service;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
import com.zt.plat.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
import com.zt.plat.framework.common.biz.system.permission.PermissionCommonApi;
import com.zt.plat.framework.common.exception.ServiceException;
import com.zt.plat.framework.common.util.servlet.ServletUtils;
@@ -12,6 +10,9 @@ import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
import com.zt.plat.framework.web.core.util.WebFrameworkUtils;
import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
import com.zt.plat.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
import com.zt.plat.module.system.api.permission.PermissionApi;
import com.zt.plat.module.system.enums.permission.RoleCodeEnum;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;

4
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/service/goview/GoViewDataServiceImpl.java
View File

@@ -1,14 +1,14 @@
package com.zt.plat.module.report.service.goview;
import com.google.common.collect.Maps;
import com.zt.plat.module.report.controller.admin.goview.vo.data.GoViewDataRespVO;
import jakarta.annotation.Resource;
import com.google.common.collect.Maps;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.rowset.SqlRowSet;
import org.springframework.jdbc.support.rowset.SqlRowSetMetaData;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import jakarta.annotation.Resource;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.Map;

1
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/service/goview/GoViewProjectService.java
View File

@@ -5,6 +5,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO;
import com.zt.plat.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO;
import com.zt.plat.module.report.dal.dataobject.goview.GoViewProjectDO;
import jakarta.validation.Valid;
/**

3
zt-module-report/zt-module-report-server/src/main/java/com/zt/plat/module/report/service/goview/GoViewProjectServiceImpl.java
View File

@@ -8,10 +8,11 @@ import com.zt.plat.module.report.controller.admin.goview.vo.project.GoViewProjec
import com.zt.plat.module.report.convert.goview.GoViewProjectConvert;
import com.zt.plat.module.report.dal.dataobject.goview.GoViewProjectDO;
import com.zt.plat.module.report.dal.mysql.goview.GoViewProjectMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import jakarta.annotation.Resource;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS;