diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ModelConfigSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ModelConfigSearchRequest.java new file mode 100644 index 00000000..8906af67 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ModelConfigSearchRequest.java @@ -0,0 +1,27 @@ +package com.nflg.mobilebroken.common.pojo.request; + +import lombok.Data; + +@Data +public class ModelConfigSearchRequest extends PageRequest { + + /** + * 型号 + */ + private String no; + + /** + * 模块ID + */ + private Integer moduleId; + + /** + * 系列批次号 + */ + private String seriesNumber; + + /** + * 类型批次号 + */ + private String typeNumber; +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ModelConfigVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ModelConfigVO.java new file mode 100644 index 00000000..d6c200d7 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ModelConfigVO.java @@ -0,0 +1,27 @@ +package com.nflg.mobilebroken.common.pojo.vo; + +import lombok.Data; + +@Data +public class ModelConfigVO { + + /** + * 模块名称 + */ + private String moduleName; + + /** + * 系列名称 + */ + private String seriesName; + + /** + * 类型名称 + */ + private String typeName; + + /** + * 机型编号 + */ + private String modelNo; +} diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/ModelConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/ModelConfigController.java new file mode 100644 index 00000000..3060151f --- /dev/null +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/ModelConfigController.java @@ -0,0 +1,33 @@ +package com.nflg.mobilebroken.quotation.controller; + +import com.nflg.mobilebroken.common.pojo.ApiResult; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.ModelConfigSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.ModelConfigVO; +import com.nflg.mobilebroken.repository.service.IQuotationModelConfigService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * 机型配置 + */ +@RestController +@RequestMapping("/model/config") +public class ModelConfigController extends ControllerBase{ + + @Resource + private IQuotationModelConfigService modelConfigService; + + /** + * 获取机型配置列表 + */ + @PostMapping("/search") + public ApiResult> search(@Valid @RequestBody ModelConfigSearchRequest request){ + return ApiResult.success(modelConfigService.search(request)); + } +} \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfig.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfig.java new file mode 100644 index 00000000..136983ae --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfig.java @@ -0,0 +1,77 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 报价-机型配置 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("quotation_model_config") +public class QuotationModelConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 机型表batch_number + */ + private Integer modelId; + + /** + * 年份 + */ + private String configYear; + + /** + * 配置版本号 + */ + private String configVersion; + + /** + * 版本状态,0:草稿;1:已发布;2:已弃用 + */ + private Integer configStatus; + + /** + * 新增人编号 + */ + private Integer createById; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改人编号 + */ + private Integer updateById; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItem.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItem.java new file mode 100644 index 00000000..4d7ebede --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItem.java @@ -0,0 +1,66 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 报价-机型配置-子项 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("quotation_model_config_item") +public class QuotationModelConfigItem implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 配置id + */ + private Long configId; + + /** + * 上级id + */ + private Long parentId; + + /** + * 部件或系统 + */ + private String partName; + + /** + * 参数/描述 + */ + private String partRemark; + + /** + * 类别,0:可选配置;1:标准配置 + */ + private Integer type; + + /** + * 选配类别,0:新增可选;1:替换可选 + */ + private Integer optionalType; + + /** + * 是否启用 + */ + private Boolean enable; + + /** + * 图片 + */ + private String imageUrl; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItemLanguage.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItemLanguage.java new file mode 100644 index 00000000..f7b14e17 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/QuotationModelConfigItemLanguage.java @@ -0,0 +1,77 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * 报价-机型配置-子项多语言 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("quotation_model_config_item_language") +public class QuotationModelConfigItemLanguage implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 配置项id + */ + private Long configItemId; + + /** + * 语言id + */ + private Long languageId; + + /** + * 部件或系统 + */ + private String partName; + + /** + * 参数/描述 + */ + private String partRemark; + + /** + * 新增人编号 + */ + private Integer createById; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改人编号 + */ + private Integer updateById; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemLanguageMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemLanguageMapper.java new file mode 100644 index 00000000..f9b46705 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemLanguageMapper.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItemLanguage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 报价-机型配置-子项多语言 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface QuotationModelConfigItemLanguageMapper extends BaseMapper { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemMapper.java new file mode 100644 index 00000000..8f8e88f9 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 报价-机型配置-子项 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface QuotationModelConfigItemMapper extends BaseMapper { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java new file mode 100644 index 00000000..08386416 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/QuotationModelConfigMapper.java @@ -0,0 +1,21 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.ModelConfigSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.ModelConfigVO; +import com.nflg.mobilebroken.repository.entity.QuotationModelConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 报价-机型配置 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface QuotationModelConfigMapper extends BaseMapper { + + PageData search(ModelConfigSearchRequest request, Page objectPage); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemLanguageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemLanguageService.java new file mode 100644 index 00000000..82314d82 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemLanguageService.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItemLanguage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 报价-机型配置-子项多语言 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IQuotationModelConfigItemLanguageService extends IService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemService.java new file mode 100644 index 00000000..eccde45d --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigItemService.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 报价-机型配置-子项 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IQuotationModelConfigItemService extends IService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java new file mode 100644 index 00000000..5ee2efef --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IQuotationModelConfigService.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.ModelConfigSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.ModelConfigVO; +import com.nflg.mobilebroken.repository.entity.QuotationModelConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 报价-机型配置 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IQuotationModelConfigService extends IService { + + PageData search(ModelConfigSearchRequest request); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemLanguageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemLanguageServiceImpl.java new file mode 100644 index 00000000..8659bacb --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemLanguageServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItemLanguage; +import com.nflg.mobilebroken.repository.mapper.QuotationModelConfigItemLanguageMapper; +import com.nflg.mobilebroken.repository.service.IQuotationModelConfigItemLanguageService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 报价-机型配置-子项多语言 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class QuotationModelConfigItemLanguageServiceImpl extends ServiceImpl implements IQuotationModelConfigItemLanguageService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemServiceImpl.java new file mode 100644 index 00000000..4dfbf8df --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.repository.entity.QuotationModelConfigItem; +import com.nflg.mobilebroken.repository.mapper.QuotationModelConfigItemMapper; +import com.nflg.mobilebroken.repository.service.IQuotationModelConfigItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 报价-机型配置-子项 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class QuotationModelConfigItemServiceImpl extends ServiceImpl implements IQuotationModelConfigItemService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java new file mode 100644 index 00000000..a28ee9ee --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/QuotationModelConfigServiceImpl.java @@ -0,0 +1,28 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.ModelConfigSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.ModelConfigVO; +import com.nflg.mobilebroken.repository.entity.QuotationModelConfig; +import com.nflg.mobilebroken.repository.mapper.QuotationModelConfigMapper; +import com.nflg.mobilebroken.repository.service.IQuotationModelConfigService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 报价-机型配置 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class QuotationModelConfigServiceImpl extends ServiceImpl implements IQuotationModelConfigService { + + @Override + public PageData search(ModelConfigSearchRequest request) { + return baseMapper.search(request,new Page<>(request.getPage(),request.getPageSize())); + } +} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemLanguageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemLanguageMapper.xml new file mode 100644 index 00000000..442ba6a1 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemLanguageMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml new file mode 100644 index 00000000..f3a158d1 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml new file mode 100644 index 00000000..f7fc5cc9 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java index 85bd2504..79cebe71 100644 --- a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java +++ b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { , Paths.get(System.getProperty("user.dir")) + "/src/main/resources/mapper")) ) .strategyConfig(builder -> { - builder.addInclude("admin_permission_role_column_map") //只生成指定表 + builder.addInclude("quotation_model_config_item_language") //只生成指定表 .entityBuilder() .enableLombok() .enableChainModel()