优化量表套餐的scaleIds
This commit is contained in:
parent
c17fcbe2e0
commit
79f581f259
|
|
@ -30,7 +30,7 @@ spring:
|
|||
# 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
|
||||
dynamic:
|
||||
# 性能分析插件(有性能损耗 不建议生产环境使用)
|
||||
p6spy: true
|
||||
p6spy: false
|
||||
# 设置默认的数据源或者数据源组,默认值即为 master
|
||||
primary: master
|
||||
# 严格模式 匹配不到数据源则报错
|
||||
|
|
|
|||
|
|
@ -1,9 +1,15 @@
|
|||
package org.dromara.system.domain;
|
||||
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import io.github.linpeilie.annotations.AutoMapping;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.system.domain.vo.SysScalePackageVo;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
|
|
@ -14,8 +20,10 @@ import java.io.Serial;
|
|||
* @date 2024-10-23
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("sys_scale_package")
|
||||
@AutoMapper(target = SysScalePackageVo.class, reverseConvertGenerate = false)
|
||||
public class SysScalePackage extends BaseEntity {
|
||||
|
||||
@Serial
|
||||
|
|
@ -35,6 +43,7 @@ public class SysScalePackage extends BaseEntity {
|
|||
/**
|
||||
* 关联量表id
|
||||
*/
|
||||
@AutoMapping(target = "scaleIds", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleIds(), \",\"))")
|
||||
private String scaleIds;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ import lombok.Data;
|
|||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 量表套餐业务对象 sys_scale_package
|
||||
*
|
||||
|
|
@ -36,8 +38,8 @@ public class SysScalePackageBo extends BaseEntity {
|
|||
/**
|
||||
* 关联量表id
|
||||
*/
|
||||
@AutoMapping(target = "scaleIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getScaleIds(), \",\"))")
|
||||
private Long[] scaleIds;
|
||||
@AutoMapping(target = "scaleIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\",source.getScaleIds()))")
|
||||
private List<String> scaleIds;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
|
|
|
|||
|
|
@ -1,17 +1,14 @@
|
|||
package org.dromara.system.domain.vo;
|
||||
|
||||
import org.dromara.system.domain.SysScalePackage;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -22,7 +19,6 @@ import java.util.Date;
|
|||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = SysScalePackage.class)
|
||||
public class SysScalePackageVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
|
|
@ -44,7 +40,7 @@ public class SysScalePackageVo implements Serializable {
|
|||
* 关联量表id
|
||||
*/
|
||||
@ExcelProperty(value = "关联量表id")
|
||||
private String scaleIds;
|
||||
List<String> scaleIds;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.dromara.system.mapper;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.dromara.system.domain.SysScalePackage;
|
||||
import org.dromara.system.domain.vo.SysScalePackageVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
|
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
|||
* @author cjw
|
||||
* @date 2024-10-23
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysScalePackageMapper extends BaseMapperPlus<SysScalePackage, SysScalePackageVo> {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService {
|
|||
public Boolean insertByBo(SysScalePackageBo bo) {
|
||||
SysScalePackage add = MapstructUtils.convert(bo, SysScalePackage.class);
|
||||
// 保存菜单id
|
||||
List<Long> scaleIds = Arrays.asList(bo.getScaleIds());
|
||||
List<String> scaleIds = bo.getScaleIds();
|
||||
if (CollUtil.isNotEmpty(scaleIds)) {
|
||||
add.setScaleIds(StringUtils.join(scaleIds, ", "));
|
||||
} else {
|
||||
|
|
@ -123,7 +123,7 @@ public class SysScalePackageServiceImpl implements ISysScalePackageService {
|
|||
public Boolean updateByBo(SysScalePackageBo bo) {
|
||||
SysScalePackage update = MapstructUtils.convert(bo, SysScalePackage.class);
|
||||
// 保存菜单id
|
||||
List<Long> scaleIds = Arrays.asList(bo.getScaleIds());
|
||||
List<String> scaleIds = bo.getScaleIds();
|
||||
if (CollUtil.isNotEmpty(scaleIds)) {
|
||||
update.setScaleIds(StringUtils.join(scaleIds, ", "));
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue