renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(系统服务): 完成达梦数据库表名迁移至 QH_ 命名规范

Browse Source 
- 更新 76 个实体类的 @TableName 注解，映射到新 QH_XXX_XXXXX 表名
- 批量替换 jeecg-system 和 jeecg-boot-base-core 中 175 个文件的
  硬编码旧表名，统一使用新 QH_ 前缀命名
- 新增 20260310-修改system数据库表名.sql，包含 76 条 ALTER TABLE
  RENAME TO 语句（分模块分组）
- 追加 5 条废弃表 DROP TABLE 语句至 20260306-信创system删表语句.sql
- 更新达梦数据库兼容性问题报告，第六节调整为 76 行，
  第八节新增 8.13 废弃表分组，合计 111 张表

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wanghao
2026-03-10 16:40:09 +08:00
co-authored by Claude Sonnet 4.6
parent 0b403a559e
commit 061749cfb3
228 changed files with 1035 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
+9 -9
View File
@@ -367,28 +367,28 @@ public interface CommonConstant {
Integer USER_IDENTITY_2 = 2;
/**
* sys_user 表 username 唯一键索引
* QH_SYS_USER 表 username 唯一键索引
*/
String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
/**
* sys_user 表 work_no 唯一键索引
* QH_SYS_USER 表 work_no 唯一键索引
*/
String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
/**
* sys_user 表 phone 唯一键索引
* QH_SYS_USER 表 phone 唯一键索引
*/
String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone";
/**
* 达梦数据库升提示。违反表[SYS_USER]唯一性约束
* 达梦数据库升提示。违反表[QH_SYS_USER]唯一性约束
*/
String SQL_INDEX_UNIQ_SYS_USER = "唯一性约束";
/**
* sys_user 表 email 唯一键索引
* QH_SYS_USER 表 email 唯一键索引
*/
String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email";
/**
* sys_quartz_job 表 job_class_name 唯一键索引
* QH_SYS_QUARTZ_JOB 表 job_class_name 唯一键索引
*/
String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name";
/**
@@ -396,15 +396,15 @@ public interface CommonConstant {
*/
String SQL_INDEX_UNIQ_CODE = "uniq_code";
/**
* sys_role 表 code 唯一键索引
* QH_SYS_ROLE 表 code 唯一键索引
*/
String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code";
/**
* sys_depart 表 code 唯一键索引
* QH_SYS_DEPART 表 code 唯一键索引
*/
String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code";
/**
* sys_category 表 code 唯一键索引
* QH_SYS_CATEGORY 表 code 唯一键索引
*/
String SQL_INDEX_UNIQ_CATEGORY_CODE = "idx_sc_code";
/**
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java
+2 -2
View File
@@ -9,8 +9,8 @@ package org.jeecg.common.constant;
public class DynamicTableConstant {
/**
* 角色首页配置表
* vue2表名: sys_role_index
* vue2表名: QH_SYS_ROLE_INDEX
* vue3表名: sys_role_index_vue3
*/
public static final String SYS_ROLE_INDEX = "sys_role_index";
public static final String QH_SYS_ROLE_INDEX = "QH_SYS_ROLE_INDEX";
}
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartGps.java
+1 -1
View File
@@ -13,7 +13,7 @@ import java.math.BigDecimal;
* @date 2023/12/4 11:01
*/
@Data
@TableName("sys_depart")
@TableName("QH_SYS_DEPART_GPS")
public class SysDepartGps implements Serializable {
private static final long serialVersionUID = 1L;
/**
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserModel.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.Date;
* @date 2023-04-19 15:26
*/
@Data
@Schema(title = "sys_user对象", description = "sys_user")
@Schema(title = "sys_user对象", description = "QH_SYS_USER")
public class SysUserModel {
/**
* id
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
+3 -3
View File
@@ -17,13 +17,13 @@ public abstract class AbstractQueryBlackListHandler {
* key-表名
* value-字段名，多个逗号隔开
* 两种配置方式-- 全部配置成小写
* ruleMap.put("sys_user", "*")sys_user所有的字段不支持查询
* ruleMap.put("sys_user", "username,password")sys_user中的username和password不支持查询
* ruleMap.put("QH_SYS_USER", "*")sys_user所有的字段不支持查询
* ruleMap.put("QH_SYS_USER", "username,password")sys_user中的username和password不支持查询
*/
public static Map<String, String> ruleMap = new HashMap<>();
static {
ruleMap.put("sys_user", "password,salt");
ruleMap.put("QH_SYS_USER", "password,salt");
}
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
+6 -6
View File
@@ -60,13 +60,13 @@ public class MybatisPlusSaasConfig {
//1.需要租户隔离的表请在此配置
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
//a.系统管理表
TENANT_TABLE.add("sys_role");
TENANT_TABLE.add("sys_user_role");
TENANT_TABLE.add("sys_depart");
TENANT_TABLE.add("sys_category");
TENANT_TABLE.add("sys_data_source");
TENANT_TABLE.add("QH_SYS_ROLE");
TENANT_TABLE.add("QH_SYS_USER_ROLE");
TENANT_TABLE.add("QH_SYS_DEPART");
TENANT_TABLE.add("QH_SYS_CATEGORY");
TENANT_TABLE.add("QH_SYS_DATA_SOURCE");
TENANT_TABLE.add("sys_position");
TENANT_TABLE.add("sys_announcement");
TENANT_TABLE.add("QH_SYS_ANNOUNCEMENT");
}
//2.示例测试
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java
+2 -2
View File
@@ -36,7 +36,7 @@ public class HttpUtils {
public static SortedMap<String, String> getAllParams(HttpServletRequest request) throws IOException {
SortedMap<String, String> result = new TreeMap<>();
// 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/sys_user,realname,username
// 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/QH_SYS_USER,realname,username
String pathVariable = request.getRequestURI().substring(request.getRequestURI().lastIndexOf("/") + 1);
if (pathVariable.contains(SymbolConstant.COMMA)) {
log.info(" pathVariable: {}", pathVariable);
@@ -74,7 +74,7 @@ public class HttpUtils {
throws IOException {
SortedMap<String, String> result = new TreeMap<>();
// 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/sys_user,realname,username
// 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/QH_SYS_USER,realname,username
String pathVariable = url.substring(url.lastIndexOf("/") + 1);
if (pathVariable.contains(SymbolConstant.COMMA)) {
log.info(" pathVariable: {}", pathVariable);
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.base.mapper.BaseCommonMapper">
<!-- 保存日志11 -->
<insert id="saveLog" parameterType="Object">
insert into sys_log (id, log_type, log_content, method, operate_type, request_url, request_type, request_param,
insert into QH_SYS_LOG (id, log_type, log_content, method, operate_type, request_url, request_type, request_param,
ip, userid, username, cost_time, create_time,create_by, tenant_id)
values(
#{dto.id,jdbcType=VARCHAR},
jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/controller/CommonExportsInfoController.java
+20 -20
View File
@@ -38,7 +38,7 @@ import java.util.List;
* @Date: 2023-05-29
* @Version: V1.0
*/
@Tag(name = "common_exports_info")
@Tag(name = "QH_COM_EXPORTS_INFO")
@RestController
@RequestMapping("/sys/common/commonExportsInfo")
@Slf4j
@@ -57,8 +57,8 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param req
* @return
*/
//@AutoLog(value = "common_exports_info-分页列表查询")
@Operation(summary = "common_exports_info-分页列表查询", description = "common_exports_info-分页列表查询")
//@AutoLog(value = "QH_COM_EXPORTS_INFO-分页列表查询")
@Operation(summary = "QH_COM_EXPORTS_INFO-分页列表查询", description = "QH_COM_EXPORTS_INFO-分页列表查询")
@GetMapping(value = "/list")
@PermissionData
public Result<IPage<CommonExportsInfo>> queryPageList(CommonExportsInfo commonExportsInfo,
@@ -89,9 +89,9 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param commonExportsInfo
* @return
*/
@AutoLog(value = "common_exports_info-添加")
@Operation(summary = "common_exports_info-添加", description = "common_exports_info-添加")
@RequiresPermissions("common:common_exports_info:add")
@AutoLog(value = "QH_COM_EXPORTS_INFO-添加")
@Operation(summary = "QH_COM_EXPORTS_INFO-添加", description = "QH_COM_EXPORTS_INFO-添加")
@RequiresPermissions("common:QH_COM_EXPORTS_INFO:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CommonExportsInfo commonExportsInfo) {
commonExportsInfoService.save(commonExportsInfo);
@@ -104,9 +104,9 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param commonExportsInfo
* @return
*/
@AutoLog(value = "common_exports_info-编辑")
@Operation(summary = "common_exports_info-编辑", description = "common_exports_info-编辑")
@RequiresPermissions("common:common_exports_info:edit")
@AutoLog(value = "QH_COM_EXPORTS_INFO-编辑")
@Operation(summary = "QH_COM_EXPORTS_INFO-编辑", description = "QH_COM_EXPORTS_INFO-编辑")
@RequiresPermissions("common:QH_COM_EXPORTS_INFO:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CommonExportsInfo commonExportsInfo) {
commonExportsInfoService.saveOrUpdate(commonExportsInfo);
@@ -119,9 +119,9 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param id
* @return
*/
@AutoLog(value = "common_exports_info-通过id删除")
@Operation(summary = "common_exports_info-通过id删除", description = "common_exports_info-通过id删除")
//@RequiresPermissions("common:common_exports_info:delete")
@AutoLog(value = "QH_COM_EXPORTS_INFO-通过id删除")
@Operation(summary = "QH_COM_EXPORTS_INFO-通过id删除", description = "QH_COM_EXPORTS_INFO-通过id删除")
//@RequiresPermissions("common:QH_COM_EXPORTS_INFO:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
commonExportsInfoService.removeById(id);
@@ -134,9 +134,9 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param ids
* @return
*/
@AutoLog(value = "common_exports_info-批量删除")
@Operation(summary = "common_exports_info-批量删除", description = "common_exports_info-批量删除")
//@RequiresPermissions("common:common_exports_info:deleteBatch")
@AutoLog(value = "QH_COM_EXPORTS_INFO-批量删除")
@Operation(summary = "QH_COM_EXPORTS_INFO-批量删除", description = "QH_COM_EXPORTS_INFO-批量删除")
//@RequiresPermissions("common:QH_COM_EXPORTS_INFO:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.commonExportsInfoService.removeByIds(Arrays.asList(ids.split(",")));
@@ -149,8 +149,8 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param id
* @return
*/
//@AutoLog(value = "common_exports_info-通过id查询")
@Operation(summary = "common_exports_info-通过id查询", description = "common_exports_info-通过id查询")
//@AutoLog(value = "QH_COM_EXPORTS_INFO-通过id查询")
@Operation(summary = "QH_COM_EXPORTS_INFO-通过id查询", description = "QH_COM_EXPORTS_INFO-通过id查询")
@GetMapping(value = "/queryById")
public Result<CommonExportsInfo> queryById(@RequestParam(name = "id", required = true) String id) {
CommonExportsInfo commonExportsInfo = commonExportsInfoService.getById(id);
@@ -166,10 +166,10 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param request
* @param commonExportsInfo
*/
@RequiresPermissions("common:common_exports_info:exportXls")
@RequiresPermissions("common:QH_COM_EXPORTS_INFO:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CommonExportsInfo commonExportsInfo) {
return super.exportXls(request, commonExportsInfo, CommonExportsInfo.class, "common_exports_info");
return super.exportXls(request, commonExportsInfo, CommonExportsInfo.class, "QH_COM_EXPORTS_INFO");
}
/**
@@ -179,7 +179,7 @@ public class CommonExportsInfoController extends JeecgController<CommonExportsIn
* @param response
* @return
*/
@RequiresPermissions("common:common_exports_info:importExcel")
@RequiresPermissions("common:QH_COM_EXPORTS_INFO:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CommonExportsInfo.class);
jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/entity/CommonExportsInfo.java
+3 -3
View File
@@ -17,16 +17,16 @@ import java.io.Serializable;
import java.util.Date;
/**
* @Description: common_exports_info
* @Description: QH_COM_EXPORTS_INFO
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
*/
@Data
@TableName("common_exports_info")
@TableName("QH_COM_EXPORTS_INFO")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "common_exports_info对象", description = "common_exports_info")
@Schema(title = "common_exports_info对象", description = "QH_COM_EXPORTS_INFO")
public class CommonExportsInfo implements Serializable {
private static final long serialVersionUID = 1L;
jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/mapper/CommonExportsInfoMapper.java
+1 -1
View File
@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.exports.entity.CommonExportsInfo;
/**
* @Description: common_exports_info
* @Description: QH_COM_EXPORTS_INFO
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/ICommonExportsInfoService.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.exports.entity.CommonExportsInfo;
/**
* @Description: common_exports_info
* @Description: QH_COM_EXPORTS_INFO
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/exports/service/impl/CommonExportsInfoServiceImpl.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.jeecg.modules.exports.service.ICommonExportsInfoService;
import org.springframework.stereotype.Service;
/**
* @Description: common_exports_info
* @Description: QH_COM_EXPORTS_INFO
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsController.java
+6 -6
View File
@@ -31,7 +31,7 @@ import java.util.Arrays;
* @Date: 2023-05-29
* @Version: V1.0
*/
@Tag(name = "common_imports")
@Tag(name = "QH_COM_IMPORTS")
@RestController
@RequestMapping("/sys/common/commonImports")
@Slf4j
@@ -76,7 +76,7 @@ public class CommonImportsController extends JeecgController<CommonImports, ICom
*/
@AutoLog(value = "添加")
@Operation(summary = "添加", description = "添加")
@RequiresPermissions("common:common_exports_item:add")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CommonImports commonImports) {
commonImportsService.save(commonImports);
@@ -91,7 +91,7 @@ public class CommonImportsController extends JeecgController<CommonImports, ICom
*/
@AutoLog(value = "编辑")
@Operation(summary = "编辑", description = "编辑")
@RequiresPermissions("common:common_exports_item:edit")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CommonImports commonImports) {
commonImportsService.updateById(commonImports);
@@ -171,10 +171,10 @@ public class CommonImportsController extends JeecgController<CommonImports, ICom
* @param request
* @param commonImports
*/
@RequiresPermissions("common:common_exports_item:exportXls")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CommonImports commonImports) {
return super.exportXls(request, commonImports, CommonImports.class, "common_exports_item");
return super.exportXls(request, commonImports, CommonImports.class, "QH_COM_EXPORTS_ITEM");
}
/**
@@ -184,7 +184,7 @@ public class CommonImportsController extends JeecgController<CommonImports, ICom
* @param response
* @return
*/
@RequiresPermissions("common:common_exports_item:importExcel")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CommonImports.class);
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsDetailController.java
+6 -6
View File
@@ -29,7 +29,7 @@ import java.util.List;
* @Date: 2023-05-29
* @Version: V1.0
*/
@Tag(name = "common_imports_detail")
@Tag(name = "QH_COM_IMPORTS_DETAIL")
@RestController
@RequestMapping("/sys/common/commonImportsDetail")
@Slf4j
@@ -67,7 +67,7 @@ public class CommonImportsDetailController extends JeecgController<CommonImports
*/
@AutoLog(value = "添加")
@Operation(summary = "添加", description = "添加")
@RequiresPermissions("common:common_exports_item:add")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CommonImportsDetail CommonImportsDetail) {
commonImportsDetailService.save(CommonImportsDetail);
@@ -82,7 +82,7 @@ public class CommonImportsDetailController extends JeecgController<CommonImports
*/
@AutoLog(value = "编辑")
@Operation(summary = "编辑", description = "编辑")
@RequiresPermissions("common:common_exports_item:edit")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CommonImportsDetail CommonImportsDetail) {
commonImportsDetailService.updateById(CommonImportsDetail);
@@ -113,7 +113,7 @@ public class CommonImportsDetailController extends JeecgController<CommonImports
*/
@AutoLog(value = "通过id删除")
@Operation(summary = "通过id删除", description = "通过id删除")
@RequiresPermissions("common:common_exports_item:delete")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
commonImportsDetailService.removeById(id);
@@ -128,7 +128,7 @@ public class CommonImportsDetailController extends JeecgController<CommonImports
*/
@AutoLog(value = "批量删除")
@Operation(summary = "批量删除", description = "批量删除")
@RequiresPermissions("common:common_exports_item:deleteBatch")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.commonImportsDetailService.removeByIds(Arrays.asList(ids.split(",")));
@@ -180,7 +180,7 @@ public class CommonImportsDetailController extends JeecgController<CommonImports
* @param response
* @return
*/
@RequiresPermissions("common:common_exports_item:importExcel")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CommonImportsDetail.class);
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/controller/CommonImportsInfoController.java
+6 -6
View File
@@ -26,7 +26,7 @@ import java.util.Arrays;
* @Date: 2023-05-29
* @Version: V1.0
*/
//@Tag(name = "common_exports_item")
//@Tag(name = "QH_COM_EXPORTS_ITEM")
@RestController
//@RequestMapping("/sys/common/commonImportsInfo")
@Slf4j
@@ -64,7 +64,7 @@ public class CommonImportsInfoController extends JeecgController<CommonImportsIn
*/
@AutoLog(value = "添加")
@Operation(summary = "添加", description = "添加")
@RequiresPermissions("common:common_exports_item:add")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CommonImportsInfo commonImportsInfo) {
commonImportsInfoService.save(commonImportsInfo);
@@ -79,7 +79,7 @@ public class CommonImportsInfoController extends JeecgController<CommonImportsIn
*/
@AutoLog(value = "编辑")
@Operation(summary = "编辑", description = "编辑")
@RequiresPermissions("common:common_exports_item:edit")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody CommonImportsInfo commonImportsInfo) {
commonImportsInfoService.updateById(commonImportsInfo);
@@ -137,10 +137,10 @@ public class CommonImportsInfoController extends JeecgController<CommonImportsIn
* @param request
* @param commonImportsInfo
*/
@RequiresPermissions("common:common_exports_item:exportXls")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CommonImportsInfo commonImportsInfo) {
return super.exportXls(request, commonImportsInfo, CommonImportsInfo.class, "common_exports_item");
return super.exportXls(request, commonImportsInfo, CommonImportsInfo.class, "QH_COM_EXPORTS_ITEM");
}
/**
@@ -150,7 +150,7 @@ public class CommonImportsInfoController extends JeecgController<CommonImportsIn
* @param response
* @return
*/
@RequiresPermissions("common:common_exports_item:importExcel")
@RequiresPermissions("common:QH_COM_EXPORTS_ITEM:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CommonImportsInfo.class);
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImports.java
+2 -2
View File
@@ -22,10 +22,10 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("common_imports")
@TableName("QH_COM_IMPORTS")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "common_imports对象", description = "common_imports")
@Schema(title = "common_imports对象", description = "QH_COM_IMPORTS")
public class CommonImports implements Serializable {
private static final long serialVersionUID = 1L;
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsDetail.java
+2 -2
View File
@@ -20,10 +20,10 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("common_imports_detail")
@TableName("QH_COM_IMPORTS_DETAIL")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "common_imports_detail对象", description = "common_imports_detail")
@Schema(title = "common_imports_detail对象", description = "QH_COM_IMPORTS_DETAIL")
public class CommonImportsDetail implements Serializable {
private static final long serialVersionUID = 1L;
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/entity/CommonImportsInfo.java
+2 -2
View File
@@ -22,10 +22,10 @@ import java.util.Date;
* @Version: V1.0
*/
@Data
@TableName("common_exports_item")
@TableName("QH_COM_EXPORTS_ITEM")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "common_exports_item对象", description = "common_exports_item")
@Schema(title = "common_exports_item对象", description = "QH_COM_EXPORTS_ITEM")
public class CommonImportsInfo implements Serializable {
private static final long serialVersionUID = 1L;
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsDetailMapper.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.imports.entity.CommonImportsDetail;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsInfoMapper.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.imports.entity.CommonImportsInfo;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/mapper/CommonImportsMapper.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.imports.entity.CommonImports;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsDetailService.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.imports.entity.CommonImportsDetail;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsInfoService.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.imports.entity.CommonImportsInfo;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ICommonImportsService.java
+1 -1
View File
@@ -7,7 +7,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.web.multipart.MultipartFile;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/ImportsUtilService.java
+1 -1
View File
@@ -5,7 +5,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.web.multipart.MultipartFile;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsDetailServiceImpl.java
+1 -1
View File
@@ -7,7 +7,7 @@ import org.jeecg.modules.imports.service.ICommonImportsDetailService;
import org.springframework.stereotype.Service;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsInfoServiceImpl.java
+1 -1
View File
@@ -7,7 +7,7 @@ import org.jeecg.modules.imports.service.ICommonImportsInfoService;
import org.springframework.stereotype.Service;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/imports/service/impl/CommonImportsServiceImpl.java
+1 -1
View File
@@ -32,7 +32,7 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
/**
* @Description: common_exports_item
* @Description: QH_COM_EXPORTS_ITEM
* @Author: jeecg-boot
* @Date: 2023-05-29
* @Version: V1.0
jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/HealthUserEmployeeEx.java
+1 -1
View File
@@ -21,7 +21,7 @@ import java.util.List;
* @Version: V1.0
*/
@Data
@TableName("health_user_employee_ex")
@TableName("QH_HLT_USER_EMPLOYEE_EX")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "health_user_employee_ex对象", description = "员工")
jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+1 -1
View File
@@ -24,7 +24,7 @@ import java.util.Objects;
* @Since 2019-01-22
*/
@Data
@TableName("sys_depart")
@TableName("QH_SYS_DEPART")
public class SysDepart implements Serializable {
private static final long serialVersionUID = 1L;
jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+3 -2
View File
@@ -26,6 +26,7 @@ import java.util.*;
* @Author scott
* @since 2018-12-20
*/
@TableName("QH_SYS_USER")
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@@ -197,8 +198,8 @@ public class SysUser implements Serializable {
/**
* 负责部门
*/
@Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Excel(name = "负责部门", width = 15, dictTable = "QH_SYS_DEPART", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "QH_SYS_DEPART", dicText = "depart_name", dicCode = "id")
private String departIds;
@TableField(exist = false)
jeecg-boot-base-core/src/main/java/org/jeecg/modules/system/entity/SysUserEmergencyContact.java
+3 -3
View File
@@ -13,16 +13,16 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: sys_user_emergency_contact
* @Description: QH_SYS_USR_EMERG_CONTACT
* @Author: jeecg-boot
* @Date: 2023-07-03
* @Version: V1.0
*/
@Data
@TableName("sys_user_emergency_contact")
@TableName("QH_SYS_USR_EMERG_CONTACT")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(title = "sys_user_emergency_contact对象", description = "sys_user_emergency_contact")
@Schema(title = "sys_user_emergency_contact对象", description = "QH_SYS_USR_EMERG_CONTACT")
public class SysUserEmergencyContact implements Serializable {
private static final long serialVersionUID = 1L;