diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index f15bfba1a..6b1e5c04e 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -20,6 +20,7 @@ import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionEnt import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.DataScopeUtil; import com.zhgd.xmgl.util.EnvironmentUtil; import com.zhgd.xmgl.util.MapBuilder; import lombok.extern.slf4j.Slf4j; @@ -41,6 +42,7 @@ import net.sf.jsqlparser.statement.select.FromItem; import net.sf.jsqlparser.statement.select.Join; import net.sf.jsqlparser.statement.select.PlainSelect; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -131,6 +133,59 @@ public class DataScopeHandler implements DataPermissionHandler { HashMap tables = new HashMap<>(16); tables.put("notice_remind_sound", getProjectSn()); tables.put("project", getProjectSn()); + tables.put("project_extend", getProjectSn()); + tables.put("project_management_group", getProjectSn()); + tables.put("message_config_v2", getProjectSn()); + tables.put("project_enterprise", getProjectSn()); + tables.put("progress_panorama_node_plan", getProjectSn()); + tables.put("progress_plan_bid_section", getProjectSn()); + tables.put("ai_config", getProjectSn()); + tables.put("enable_message_dev", getProjectSn()); + tables.put("dev_message_config", getProjectSn()); + tables.put("enable_message_dev_rule", getProjectSn()); + tables.put("base_role", getProjectSn()); + tables.put("xz_project_org", getProjectSn()); + tables.put("uface_dev", getProjectSn()); + tables.put("project_uface_config", getProjectSn()); + tables.put("worker_type", getProjectSn()); + tables.put("worker_attendance_rule", getProjectSn()); + tables.put("uface_dev_group", getProjectSn()); + tables.put("project_config", getProjectSn()); + tables.put("worker_attendance_group_v2", getProjectSn()); + tables.put("team_info", getProjectSn()); + tables.put("region_violation", getProjectSn()); + tables.put("upload_execute_record", getProjectSn()); + tables.put("worker_info_audit_record", getProjectSn()); + tables.put("worker_month_attendance_statistics", getProjectSn()); + tables.put("worker_attendance", getProjectSn()); + tables.put("worker_blacklist", getProjectSn()); + tables.put("worker_safe_education", getProjectSn()); + tables.put("worker_evaluate", getProjectSn()); + tables.put("xz_certificate_expire_alarm_record", getProjectSn()); + tables.put("project_fine_record", getProjectSn()); + tables.put("electric_fence", getProjectSn()); + tables.put("xz_worker_safe_watch_alarm", getProjectSn()); + tables.put("xz_hikvision_compare_data", getProjectSn()); + tables.put("xz_worker_safe_watch_config", getProjectSn()); + tables.put("xz_visitor_manage_record", getProjectSn()); + tables.put("worker_access_record", getProjectSn()); + tables.put("worker_daily_attendance_statistics_v2", getProjectSn()); + tables.put("worker_exit_config", getProjectSn()); + tables.put("car_pass_record", getProjectSn()); + tables.put("car_info", getProjectSn()); + tables.put("car_camera", getProjectSn()); + tables.put("car_type", getProjectSn()); + tables.put("ai_analyse_hard_ware_alarm_record", getProjectSn()); + tables.put("xz_ai_deduct_rule", getProjectSn()); + tables.put("work_ticket", getProjectSn()); + tables.put("rt_risk_security_library_type", getProjectSn()); + tables.put("rt_risk_inventory_type", getProjectSn()); + tables.put("quality_region", getProjectSn()); + tables.put("police_camera_item", getProjectSn()); + tables.put("frontier_protection_no_net_dev", getProjectSn()); + tables.put("frontier_protection_no_net_data", getProjectSn()); + tables.put("police_camera_item_file", getProjectSn()); + tables.put("ocr_build_log", getProjectSn()); return tables; } @@ -164,17 +219,17 @@ public class DataScopeHandler implements DataPermissionHandler { List expressions = new ArrayList<>(); if (!DataScopeInterceptor.findIgnoreDataScope(parameter, ds)) { if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_ADMINISTRATOR_ACCOUNT.getValue())) { - filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get1CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem)); - filterProjectForCompany(plainSelect, user, ds); + filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get1CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem), jo); + filterProjectForCompany(plainSelect, user, ds, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_DISTRICT_ACCOUNT.getValue())) { - filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get2CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem)); - filterProjectForCompany(plainSelect, user, ds); + filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get2CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem), jo); + filterProjectForCompany(plainSelect, user, ds, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_CITY_ACCOUNT.getValue())) { - filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get3CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem)); - filterProjectForCompany(plainSelect, user, ds); + filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get3CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem), jo); + filterProjectForCompany(plainSelect, user, ds, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_SUB_ACCOUNT.getValue())) { - filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get4CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem)); - filterProjectForCompany(plainSelect, user, ds); + filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> get4CompanySql(SecurityUtils.getUser().getUserId(), userFilterItem), jo); + filterProjectForCompany(plainSelect, user, ds, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue())) { filterForCompanyOrProject(plainSelect, ds, expressions, SecurityUtils.getUser().getUserId(), (userFilterItem) -> { return StrUtil.format(" \n" + @@ -183,12 +238,12 @@ public class DataScopeHandler implements DataPermissionHandler { " from system_user u\n" + " WHERE u.user_id={}\n" + " ) and {}.account_type = 6", userFilterItem, SecurityUtils.getUser().getUserId(), StrUtil.subBefore(userFilterItem, ".", true)); - }); - filterProjectForProject(plainSelect, ds); + }, jo); + filterProjectForProject(plainSelect, ds, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) { - filterByProjectSubAccount(plainSelect, ds, expressions); + filterByProjectSubAccount(plainSelect, ds, expressions, jo); } else if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.SUPPLIER.getValue())) { - filterBySupplier(plainSelect, ds, expressions); + filterBySupplier(plainSelect, ds, expressions, jo); } if (expressions.size() > 0) { Expression dataExpression; @@ -265,12 +320,12 @@ public class DataScopeHandler implements DataPermissionHandler { * @param user * @param ds */ - private void filterProjectForCompany(PlainSelect plainSelect, UserInfo user, DataScope ds) { + private void filterProjectForCompany(PlainSelect plainSelect, UserInfo user, DataScope ds, JSONObject param) { List projectSns = companyService.getProjectSnsBySn(SecurityUtils.getUser().getSn(), user.getAccountType()); if (CollUtil.isEmpty(projectSns)) { projectSns.add("0"); } - List filterProjectItems = getNeedFilterLeftExpression(plainSelect, getFieldProjectSnTables(), ds); + List filterProjectItems = getNeedFilterLeftExpression(plainSelect, getFieldProjectSnTables(), ds, param); if (CollUtil.isNotEmpty(filterProjectItems)) { for (String item : filterProjectItems) { inExpression(item, projectSns, plainSelect); @@ -285,8 +340,8 @@ public class DataScopeHandler implements DataPermissionHandler { * @param ds * @param expressions */ - private void filterBySupplier(PlainSelect plainSelect, DataScope ds, List expressions) { - List filterEnterprises = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseTables(), ds); + private void filterBySupplier(PlainSelect plainSelect, DataScope ds, List expressions, JSONObject param) { + List filterEnterprises = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseTables(), ds, param); EnterpriseInfo ei = enterpriseInfoMapper.getXzSupplierByUserId(SecurityUtils.getUser().getUserId()); Long id; if (ei == null) { @@ -302,7 +357,7 @@ public class DataScopeHandler implements DataPermissionHandler { } //解析ai预警 - List filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true); + List filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true, param); if (CollUtil.isNotEmpty(filterAis)) { List videoItems = aiAnalyseHardWareRecordService.getAiAnalyseHardIdsByEnterpriseId(id); if (CollUtil.isEmpty(videoItems)) { @@ -324,18 +379,18 @@ public class DataScopeHandler implements DataPermissionHandler { * @param ds * @param expressions */ - private void filterByProjectSubAccount(PlainSelect plainSelect, DataScope ds, List expressions) { - filterProjectForProject(plainSelect, ds); + private void filterByProjectSubAccount(PlainSelect plainSelect, DataScope ds, List expressions, JSONObject param) { + filterProjectForProject(plainSelect, ds, param); List authEnterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); authEnterpriseIds.add("0"); - List filterEnterprises = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseTables(), ds); + List filterEnterprises = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseTables(), ds, param); if (CollUtil.isNotEmpty(filterEnterprises)) { for (String filterEnterprise : filterEnterprises) { inExpression(filterEnterprise, authEnterpriseIds, plainSelect); } } - List filterItems = getNeedFilterLeftExpression(plainSelect, getFieldVideoTables(), ds); + List filterItems = getNeedFilterLeftExpression(plainSelect, getFieldVideoTables(), ds, param); if (CollUtil.isNotEmpty(filterItems)) { List videoItems = userDevAuthorityService.getVideoItemsIfSubProject(); for (String item : filterItems) { @@ -343,7 +398,7 @@ public class DataScopeHandler implements DataPermissionHandler { } } - List filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true); + List filterAis = getNeedFilterLeftExpression(plainSelect, getFieldAiTables(), ds, true, param); if (CollUtil.isNotEmpty(filterAis)) { List videoItems = aiAnalyseHardWareRecordService.getAiAnalyseHardIdsByUserId(); if (CollUtil.isEmpty(videoItems)) { @@ -360,7 +415,7 @@ public class DataScopeHandler implements DataPermissionHandler { //ocr施工日志施工单位 HashMap ocrBuildLogTables = new HashMap<>(); ocrBuildLogTables.put("ocr_build_log", "id"); - List filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds); + List filterOcrBuildLogTables = getNeedFilterLeftExpression(plainSelect, ocrBuildLogTables, ds, param); if (CollUtil.isNotEmpty(filterOcrBuildLogTables)) { for (String filterEnterprise : filterOcrBuildLogTables) { String uploaderIdField = StrUtil.subBefore(filterEnterprise, ".", false) + "." + "uploader_id"; @@ -378,7 +433,7 @@ public class DataScopeHandler implements DataPermissionHandler { //安全隐患 HashMap xzSecurityTables = new HashMap<>(); xzSecurityTables.put("xz_security_quality_inspection_record", "id"); - List filterXzSecurityEnterprises = getNeedFilterLeftExpression(plainSelect, xzSecurityTables, ds); + List filterXzSecurityEnterprises = getNeedFilterLeftExpression(plainSelect, xzSecurityTables, ds, param); if (CollUtil.isNotEmpty(filterXzSecurityEnterprises)) { List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); enterpriseIds.add("0"); @@ -397,8 +452,8 @@ public class DataScopeHandler implements DataPermissionHandler { * @param plainSelect * @param ds */ - private void filterProjectForProject(PlainSelect plainSelect, DataScope ds) { - List filterProjectItems = getNeedFilterLeftExpression(plainSelect, getFieldProjectSnTables(), ds); + private void filterProjectForProject(PlainSelect plainSelect, DataScope ds, JSONObject param) { + List filterProjectItems = getNeedFilterLeftExpression(plainSelect, getFieldProjectSnTables(), ds, param); if (CollUtil.isNotEmpty(filterProjectItems)) { for (String item : filterProjectItems) { equalsTo(item, SecurityUtils.getUser().getSn(), plainSelect); @@ -415,9 +470,9 @@ public class DataScopeHandler implements DataPermissionHandler { * @param userId * @param companySqlProvider */ - private void filterForCompanyOrProject(PlainSelect plainSelect, DataScope ds, List expressions, Long userId, Function companySqlProvider) { - List userFilterItems = getAuthUserFilterItem(plainSelect, ds); - List ownFilterItems = getOwnUserFilterItem(plainSelect, ds); + private void filterForCompanyOrProject(PlainSelect plainSelect, DataScope ds, List expressions, Long userId, Function companySqlProvider, JSONObject param) { + List userFilterItems = getAuthUserFilterItem(plainSelect, ds, param); + List ownFilterItems = getOwnUserFilterItem(plainSelect, ds, param); for (int i = 0; i < userFilterItems.size(); i++) { String userFilterItem = userFilterItems.get(i); String sql = StrUtil.format(" (({}) OR {}={})", @@ -429,10 +484,10 @@ public class DataScopeHandler implements DataPermissionHandler { } @NotNull - private List getOwnUserFilterItem(PlainSelect plainSelect, DataScope ds) { + private List getOwnUserFilterItem(PlainSelect plainSelect, DataScope ds, JSONObject param) { List ownFilterItems = getNeedFilterLeftExpression(plainSelect, new MapBuilder() .put("system_user", "user_id") - .build(), ds); + .build(), ds, param); return ownFilterItems; } @@ -444,10 +499,10 @@ public class DataScopeHandler implements DataPermissionHandler { * @return */ @NotNull - private List getAuthUserFilterItem(PlainSelect plainSelect, DataScope ds) { + private List getAuthUserFilterItem(PlainSelect plainSelect, DataScope ds, JSONObject param) { List userFilterItems = getNeedFilterLeftExpression(plainSelect, new MapBuilder() .put("system_user", "sn") - .build(), ds); + .build(), ds, param); return userFilterItems; } @@ -564,18 +619,20 @@ public class DataScopeHandler implements DataPermissionHandler { * @param onlyAlas false：表别名.字段 true：表别名 * @return */ - private List getNeedFilterLeftExpression(PlainSelect plainSelect, Map tables, DataScope ds, boolean onlyAlas) { + private List getNeedFilterLeftExpression(PlainSelect plainSelect, Map tables, DataScope ds, boolean onlyAlas, JSONObject param) { ArrayList rtList = new ArrayList<>(); String[] dsArr = ds.includeTable(); - if (dsArr.length > 0) { - Map nt = new HashMap<>(16); - for (String ds1 : dsArr) { - if (tables.containsKey(ds1)) { - nt.put(ds1, tables.get(ds1)); - } - } - tables = nt; + if (ArrayUtils.isEmpty(dsArr)) { + String defaultTableName = DataScopeUtil.getDefaultTableName((Class) param.get(DataScopeInterceptor.MAPPER_CLASS)); + dsArr = new String[]{defaultTableName}; } + Map nt = new HashMap<>(16); + for (String ds1 : dsArr) { + if (tables.containsKey(ds1)) { + nt.put(ds1, tables.get(ds1)); + } + } + tables = nt; FromItem fromItem = plainSelect.getFromItem(); if (fromItem instanceof Table) { Table table = (Table) fromItem; @@ -625,8 +682,8 @@ public class DataScopeHandler implements DataPermissionHandler { } - private List getNeedFilterLeftExpression(PlainSelect plainSelect, Map tables, DataScope ds) { - return getNeedFilterLeftExpression(plainSelect, tables, ds, false); + private List getNeedFilterLeftExpression(PlainSelect plainSelect, Map tables, DataScope ds, JSONObject param) { + return getNeedFilterLeftExpression(plainSelect, tables, ds, false, param); } //private PlainSelect dataScopeFilterByEnt(PlainSelect plainSelect, SecurityUser user) { diff --git a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java index bfe13d211..6ed6a6333 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java @@ -14,7 +14,6 @@ import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.util.SpringContextUtils; import com.zhgd.xmgl.constant.Cts; import com.zhgd.xmgl.entity.dto.OperLogDataChange; -import com.zhgd.xmgl.entity.dto.OperLogInsertChange; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.EnvironmentUtil; import com.zhgd.xmgl.util.LogMdcUtil; @@ -25,7 +24,6 @@ import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.insert.Insert; import net.sf.jsqlparser.statement.select.*; -import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.executor.statement.StatementHandler; import org.apache.ibatis.mapping.BoundSql; @@ -41,7 +39,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.lang.reflect.Array; import java.lang.reflect.Method; import java.sql.Connection; import java.sql.SQLException; @@ -55,6 +52,7 @@ import java.util.regex.Matcher; @Slf4j public class DataScopeInterceptor extends JsqlParserSupport implements InnerInterceptor { + public static final String MAPPER_CLASS = "mapperClass"; @Setter private DataScopeHandler dataScopeHandler; @@ -203,6 +201,7 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte JSONObject jo = new JSONObject(); jo.put("ds", annotation); jo.put("parameter", parameter); + jo.put(MAPPER_CLASS, clazz); mpBs.sql(this.parserSingle(mpBs.sql(), jo)); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java index c05ca706c..6063017c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java @@ -237,7 +237,7 @@ public class CompanyController { @ApiImplicitParam(name = "projectType", value = "是否展示，0否，1是", paramType = "body", required = true, dataType = "String"), }) @PostMapping("/getComapnyStatisticsList") - @PreAuthorize("@perm.hasCompanySnAccess(#map['sn'])") + @PreAuthorize("@perm.hasSnAccess(#map['sn'])") public Result> getCompanyStatisticsList(@RequestBody Map map) { return Result.success(companyService.getCompanyStatisticsList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java index f8846264c..5fb4cbf54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java @@ -1,13 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.controller; -import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.basicdata.entity.OperationLog; import com.zhgd.xmgl.modules.basicdata.service.IOperationLogService; import io.swagger.annotations.Api; @@ -19,13 +13,10 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -61,7 +52,8 @@ public class OperationLogController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "operUserId", value = "项目子账号传用户id", paramType = "body", required = true, dataType = "Integer"), }) - @PostMapping(value = "/list") + @PostMapping(value = "/list") + @PreAuthorize("@perm.hasSnAccess(#map['sn'])") public Result> queryPageList(@RequestBody Map map) { map.put("isOrder", 1); return Result.success(operationLogService.selectOperationLogPage(map)); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 341a62f16..28aa273a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -182,6 +182,7 @@ public class SystemUserController { @ApiImplicitParam(name = "departmentIdList", required = false, value = "部门idList", paramType = "body"), }) @PostMapping(value = "/getProjectChilderSystemUserList") + @PreAuthorize("@perm.hasProjectSnAccess(#map['projectSn'])") public Result> getProjectChilderSystemUserList(@RequestBody Map map) { return Result.success(systemUserService.getProjectChildernSystemUserList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseRoleMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseRoleMapper.java index 0809afc34..70d631c99 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseRoleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseRoleMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.basicdata.entity.BaseRole; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,6 +16,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface BaseRoleMapper extends BaseMapper { /** * 根据用户id查询角色 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/UploadExecuteRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/UploadExecuteRecordMapper.java index 6f63fdc88..f833023be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/UploadExecuteRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/UploadExecuteRecordMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.entity.UploadExecuteRecord; import org.apache.ibatis.annotations.Mapper; @@ -19,6 +20,7 @@ import java.util.Map; */ @Mapper @Repository +@DataScope public interface UploadExecuteRecordMapper extends BaseMapper { /** * 分页列表查询上传外部结果执行记录信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java index b4f86b687..2eeb63641 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.car.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.car.entity.CarCamera; import org.apache.ibatis.annotations.Mapper; @@ -13,6 +14,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface CarCameraMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java index 37a8ba618..309ceec03 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java @@ -1,13 +1,14 @@ package com.zhgd.xmgl.modules.car.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.car.entity.CarType; +import org.apache.ibatis.annotations.Mapper; + import java.util.List; import java.util.Map; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import org.apache.ibatis.annotations.Mapper; -import com.zhgd.xmgl.modules.car.entity.CarType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * @Description: 车辆类型表 * @author： pds @@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface CarTypeMapper extends BaseMapper { /** * 根据相机id获取车辆列表 diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java index 7eeaf81f0..4e538ce8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface FrontierProtectionNoNetDataMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java index 730036263..45a8bb0b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; @@ -20,6 +21,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface FrontierProtectionNoNetDevMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemFileMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemFileMapper.java index af15fe577..5c66bf045 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemFileMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemFileMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItemFile; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemFileVo; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface PoliceCameraItemFileMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemMapper.java index b218854bd..0b3b3625d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/PoliceCameraItemMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemVo; @@ -23,7 +24,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper -//@DataScope(includeTable = "police_camera_item") +@DataScope(includeTable = "police_camera_item") public interface PoliceCameraItemMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketMapper.java index b147d60ce..b7ebd50b9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.policecamera.entity.WorkTicket; import com.zhgd.xmgl.modules.policecamera.entity.vo.CountWorkTicketVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketVo; @@ -21,6 +22,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface WorkTicketMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketTypeMapper.java index 0d9328d10..b6be5fc96 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketTypeMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketType; import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketTypeVo; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/AiConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/AiConfigMapper.java index 743c8c709..24dc24184 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/AiConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/AiConfigMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.project.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.project.entity.AiConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.project.entity.AiConfig; +import org.apache.ibatis.annotations.Mapper; /** * @Description: AI对话配置 @@ -14,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface AiConfigMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/DevMessageConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/DevMessageConfigMapper.java index 189675ae8..8e2eab0b2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/DevMessageConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/DevMessageConfigMapper.java @@ -1,18 +1,18 @@ package com.zhgd.xmgl.modules.project.mapper; -import java.util.List; -import java.util.HashMap; - -import com.zhgd.xmgl.modules.project.entity.DevMessageConfig; -import com.zhgd.xmgl.modules.project.entity.vo.DevMessageConfigVo; -import com.zhgd.xmgl.modules.project.entity.dto.DevMessageConfigDto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.project.entity.DevMessageConfig; +import com.zhgd.xmgl.modules.project.entity.vo.DevMessageConfigVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.HashMap; +import java.util.List; /** * @Description: 设备短信配置 @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface DevMessageConfigMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevMapper.java index 04110d62c..b67a0c38e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevMapper.java @@ -1,18 +1,18 @@ package com.zhgd.xmgl.modules.project.mapper; -import java.util.List; -import java.util.HashMap; - -import com.zhgd.xmgl.modules.project.entity.EnableMessageDev; -import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevVo; -import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevDto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.project.entity.EnableMessageDev; +import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.HashMap; +import java.util.List; /** * @Description: 通知设备 @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface EnableMessageDevMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java index 095e64a64..20e20316b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java @@ -1,18 +1,19 @@ package com.zhgd.xmgl.modules.project.mapper; -import java.util.List; -import java.util.HashMap; - -import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule; -import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo; -import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevRuleDto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule; +import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo; +import liquibase.pro.packaged.D; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.HashMap; +import java.util.List; /** * @Description: 通知设备规则 @@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface EnableMessageDevRuleMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/MessageConfigV2Mapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/MessageConfigV2Mapper.java index f1f500daa..1b79783a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/MessageConfigV2Mapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/MessageConfigV2Mapper.java @@ -1,17 +1,18 @@ package com.zhgd.xmgl.modules.project.mapper; -import java.util.List; -import java.util.HashMap; -import com.zhgd.xmgl.modules.project.entity.MessageConfigV2; -import com.zhgd.xmgl.modules.project.entity.vo.MessageConfigV2Vo; -import com.zhgd.xmgl.modules.project.entity.dto.MessageConfigV2Dto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.project.entity.MessageConfigV2; +import com.zhgd.xmgl.modules.project.entity.vo.MessageConfigV2Vo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.HashMap; +import java.util.List; /** * @Description: 短信配置v2 @@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface MessageConfigV2Mapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java index 566f9d55a..18a0de6c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.entity.ProgressPanoramaNodePlan; import com.zhgd.xmgl.modules.project.entity.vo.KeyNodeEarlyWarningStatisticsVo; @@ -19,6 +20,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface ProgressPanoramaNodePlanMapper extends BaseMapper { /** * 分页列表查询进度-全景节点计划信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPlanBidSectionMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPlanBidSectionMapper.java index f0e95ee4c..a6799b508 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPlanBidSectionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPlanBidSectionMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.project.entity.ProgressPlanBidSection; import org.apache.ibatis.annotations.Mapper; @@ -14,6 +15,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface ProgressPlanBidSectionMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java index a08af4349..e198d0e60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.project.entity.ProjectConfig; import org.apache.ibatis.annotations.Mapper; @@ -13,6 +14,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface ProjectConfigMapper extends BaseMapper { /** * 外部调用修改项目状态 diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java index 32c890ef8..4e601b451 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java @@ -2,10 +2,12 @@ package com.zhgd.xmgl.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -21,6 +23,7 @@ import java.util.Map; */ @Mapper @Repository +@DataScope public interface ProjectEnterpriseMapper extends BaseMapper { /** * 分页列表查询项目关联的劳务公司信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java index 6343f42c8..9ac8ca5a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.entity.ProjectExtend; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import java.util.Map; @@ -14,6 +16,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface ProjectExtendMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectManagementGroupMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectManagementGroupMapper.java index 0dce8ce0e..0a3ddb955 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectManagementGroupMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectManagementGroupMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.project.mapper; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.project.entity.ProjectManagementGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface ProjectManagementGroupMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java index 65e02b68f..432340662 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java @@ -22,7 +22,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper -@DataScope +@DataScope(includeTable = "project") public interface ProjectMapper extends BaseMapper { /** * 项目分页查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectUfaceConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectUfaceConfigMapper.java index 72ee140c7..86c2f138a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectUfaceConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectUfaceConfigMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.project.mapper; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.project.entity.ProjectUfaceConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface ProjectUfaceConfigMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java index 22b0c08c6..22e8058b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.quality.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.quality.entity.QualityRegion; import com.zhgd.xmgl.modules.quality.entity.vo.QualityRegionVo; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,7 @@ import java.util.Set; * @version： V1.0 */ @Mapper +@DataScope public interface QualityRegionMapper extends BaseMapper { /** * 列表查询质量—检查部位信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java index 65c052234..6720316b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -18,6 +20,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface RtRiskInventoryTypeMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java index eb6e2afbb..468791006 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.rt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType; import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType; import org.apache.ibatis.annotations.Mapper; @@ -16,6 +17,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface RtRiskSecurityLibraryTypeMapper extends BaseMapper { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/ElectricFenceMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/ElectricFenceMapper.java index 6c03b742b..1058482e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/ElectricFenceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/ElectricFenceMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.worker.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.worker.entity.ElectricFence; import org.apache.ibatis.annotations.Mapper; @@ -14,6 +15,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface ElectricFenceMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/RegionViolationMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/RegionViolationMapper.java index f0348cab8..b588bf388 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/RegionViolationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/RegionViolationMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.worker.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.worker.entity.RegionViolation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.worker.entity.RegionViolation; +import org.apache.ibatis.annotations.Mapper; /** * @Description: 中水北方区域违规记录 @@ -14,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface RegionViolationMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java index e55c902a9..4ba51cd3a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java @@ -23,6 +23,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface TeamInfoMapper extends BaseMapper { /** * 查询企业下的班组列表 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevGroupMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevGroupMapper.java index e58d06189..ec3a8ecb6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevGroupMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevGroupMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.worker.entity.UfaceDevGroup; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,6 +19,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface UfaceDevGroupMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java index 28e2aa38c..673276b00 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.worker.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.UfaceDev; import org.apache.ibatis.annotations.Mapper; @@ -21,6 +22,7 @@ import java.util.Map; */ @Mapper @Repository +@DataScope public interface UfaceDevMapper extends BaseMapper { /** * 统计人脸设备数量 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceGroupV2Mapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceGroupV2Mapper.java index 8f8d4ad40..a0c943dfe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceGroupV2Mapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceGroupV2Mapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.worker.entity.WorkerAttendanceGroupV2; import com.zhgd.xmgl.modules.worker.entity.vo.WorkerAttendanceGroupV2Vo; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerAttendanceGroupV2Mapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java index 73dcfa922..e813e8961 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java @@ -30,7 +30,7 @@ import java.util.Map; */ @Mapper @Repository -@DataScope(includeTable = {"worker_info", "enterprise_info"}) +@DataScope(includeTable = {"worker_info", "enterprise_info", "worker_attendance"}) public interface WorkerAttendanceMapper extends BaseMapper { /** * 查询个人具体某一天的考勤情况 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceRuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceRuleMapper.java index 52951fd02..33c95c786 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceRuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceRuleMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.worker.mapper; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.worker.entity.WorkerAttendanceRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerAttendanceRuleMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerBlacklistMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerBlacklistMapper.java index 4fd1a2cb8..d5d24eb28 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerBlacklistMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerBlacklistMapper.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.worker.entity.WorkerBlacklist; @@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerBlacklistMapper extends BaseMapper { /** *统计公司黑名单人员数量 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerDailyAttendanceStatisticsV2Mapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerDailyAttendanceStatisticsV2Mapper.java index 8e56c7594..c7c828cf6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerDailyAttendanceStatisticsV2Mapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerDailyAttendanceStatisticsV2Mapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.worker.entity.WorkerDailyAttendanceStatisticsV2; import com.zhgd.xmgl.modules.worker.entity.bo.CountWorkerDailyAttendanceStatisticsV2ByDateBo; import com.zhgd.xmgl.modules.worker.entity.bo.ExportWorkerDailyAttendancesStaticsByDepartmentTeamXlsBo; @@ -23,6 +24,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerDailyAttendanceStatisticsV2Mapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerEvaluateMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerEvaluateMapper.java index 43390b29e..1d7d6c3ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerEvaluateMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerEvaluateMapper.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.worker.entity.WorkerEvaluate; @@ -17,6 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerEvaluateMapper extends BaseMapper { /** * 分页列表查询人员评价表信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerExitConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerExitConfigMapper.java index c654768e9..be5dcd267 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerExitConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerExitConfigMapper.java @@ -1,18 +1,18 @@ package com.zhgd.xmgl.modules.worker.mapper; -import java.util.List; -import java.util.HashMap; - -import com.zhgd.xmgl.modules.worker.entity.WorkerExitConfig; -import com.zhgd.xmgl.modules.worker.entity.vo.WorkerExitConfigVo; -import com.zhgd.xmgl.modules.worker.entity.dto.WorkerExitConfigDto; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.worker.entity.WorkerExitConfig; +import com.zhgd.xmgl.modules.worker.entity.vo.WorkerExitConfigVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.HashMap; +import java.util.List; /** * @Description: 人员退场配置 @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerExitConfigMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java index ac733152f..dfb40e0dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerMonthAttendanceStatistics; import org.apache.ibatis.annotations.Mapper; @@ -18,6 +19,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerMonthAttendanceStatisticsMapper extends BaseMapper { /** * 分页人员考勤统计列表 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java index cf61a59e3..b2731d3d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java @@ -21,6 +21,7 @@ import java.util.Set; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerSafeEducationMapper extends BaseMapper { /** * 分页列表查询安全教育记录信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerTypeMapper.java index 8dac77987..44e1bbb99 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerTypeMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.worker.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.worker.entity.WorkerType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerTypeMapper extends BaseMapper { /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzAiDeductRuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzAiDeductRuleMapper.java index 29b4449f4..d52a8a930 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzAiDeductRuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzAiDeductRuleMapper.java @@ -1,7 +1,9 @@ package com.zhgd.xmgl.modules.xz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,6 +16,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface XzAiDeductRuleMapper extends BaseMapper { /** * 通过字典id列表获取AI扣分规则列表 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzCertificateExpireAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzCertificateExpireAlarmRecordMapper.java index ec3b39f86..f6047b027 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzCertificateExpireAlarmRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzCertificateExpireAlarmRecordMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.mapper; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.xz.entity.XzCertificateExpireAlarmRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface XzCertificateExpireAlarmRecordMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java index ec7806390..073c1fea6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.mapper; +import com.zhgd.annotation.DataScope; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface XzHikvisionCompareDataMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java index 2debcf3ac..66d104623 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.xz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wflow.bean.vo.OrgTreeVo; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,6 +17,7 @@ import java.util.List; * @version： V1.0 */ @Mapper +@DataScope public interface XzProjectOrgMapper extends BaseMapper { /** * 删除子集 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzVisitorManageRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzVisitorManageRecordMapper.java index 326f883b8..be6511139 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzVisitorManageRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzVisitorManageRecordMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.xz.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.xz.entity.XzVisitorManageRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.xz.entity.XzVisitorManageRecord; +import org.apache.ibatis.annotations.Mapper; /** * @Description: 访客信息 @@ -14,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface XzVisitorManageRecordMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzWorkerSafeWatchConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzWorkerSafeWatchConfigMapper.java index 221946113..c8d0be3fd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzWorkerSafeWatchConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzWorkerSafeWatchConfigMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.xz.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.xz.entity.XzWorkerSafeWatchConfig; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 安全履职配置信息 @@ -14,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface XzWorkerSafeWatchConfigMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java index 6ce6d7915..a8e21748a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.security.mapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface WorkerAccessRecordMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/util/DataScopeUtil.java b/src/main/java/com/zhgd/xmgl/util/DataScopeUtil.java new file mode 100644 index 000000000..2d289ee37 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/util/DataScopeUtil.java @@ -0,0 +1,77 @@ +package com.zhgd.xmgl.util; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +public class DataScopeUtil { + + /** + * 从 Mapper 接口上获取其泛型父类（BaseMapper）的实际类型参数 + * + * @param mapperClass Mapper 接口的 Class 对象 + * @return 泛型参数对应的 Class，如果获取失败则返回 null + */ + public static Class getEntityClassFromMapper(Class mapperClass) { + // 获取 mapperClass 的所有泛型接口（包括父接口） + Type[] genericInterfaces = mapperClass.getGenericInterfaces(); + for (Type genericInterface : genericInterfaces) { + // 只处理 ParameterizedType（参数化类型，即带了泛型参数的接口） + if (genericInterface instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) genericInterface; + // 检查这个泛型接口是否是 BaseMapper + Type rawType = parameterizedType.getRawType(); + if (rawType.getTypeName().equals("com.baomidou.mybatisplus.core.mapper.BaseMapper")) { + // 获取 BaseMapper 中的第一个类型参数 T + Type[] actualTypeArguments = parameterizedType.getActualTypeArguments(); + if (actualTypeArguments.length > 0) { + Type entityType = actualTypeArguments[0]; + if (entityType instanceof Class) { + return (Class) entityType; + } + } + } + } + } + return null; + } + + /** + * 将驼峰命名的类名转换为蛇形命名的表名 + * 例如：ProjectInfo -> project_info + * + * @param clazz 实体类的 Class 对象 + * @return 数据库表名 + */ + public static String convertCamelToSnake(Class clazz) { + String className = clazz.getSimpleName(); + // 正则表达式：在大写字母前插入下划线，并全部转换为小写 + String regex = "([a-z])([A-Z])"; + String replacement = "$1_$2"; + String snakeCaseName = className + .replaceAll(regex, replacement) + .toLowerCase(); + + // 处理可能出现的首字母是大写的情况（例如类名本身） + // 简单的实现：确保不以下滑线开头 + if (snakeCaseName.startsWith("_")) { + snakeCaseName = snakeCaseName.substring(1); + } + return snakeCaseName; + } + + /** + * 获取默认表名的主要方法 + * + * @param mapperClass Mapper 接口的 Class 对象 + * @return 默认的数据库表名 + */ + public static String getDefaultTableName(Class mapperClass) { + Class entityClass = getEntityClassFromMapper(mapperClass); + if (entityClass != null) { + return convertCamelToSnake(entityClass); + } + // 如果无法从泛型获取，可以返回一个默认值或抛出异常 + throw new RuntimeException("无法从 Mapper: " + mapperClass.getName() + " 中推断出默认表名。请检查它是否继承了 BaseMapper 并指定了泛型类型。"); + } + +}