diff --git a/pom.xml b/pom.xml index ecb96a7..e4c2db6 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,24 @@ ruoyi-common-swagger + + + com.ruoyi + tuoheng-api-fms + + + + + org.flywaydb + flyway-core + + + + + org.flywaydb + flyway-mysql + + diff --git a/src/main/java/com/ruoyi/fms/controller/FmsTempController.java b/src/main/java/com/ruoyi/fms/controller/FmsTempController.java new file mode 100644 index 0000000..902491d --- /dev/null +++ b/src/main/java/com/ruoyi/fms/controller/FmsTempController.java @@ -0,0 +1,70 @@ +package com.ruoyi.fms.controller; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.security.annotation.InnerAuth; +import com.ruoyi.fms.api.domain.FmsTempVO; +import com.ruoyi.fms.controller.convert.FmsTempControllerConvert; +import com.ruoyi.fms.service.api.IFmsTempService; +import com.ruoyi.fms.service.dto.FmsTempDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 飞行管理临时表Controller + * + * @author ruoyi + * @date 2026-01-17 + */ +@RestController +@RequestMapping("/fms/temp") +public class FmsTempController extends BaseController +{ + @Autowired + private IFmsTempService fmsTempService; + + /** + * 查询飞行管理临时表列表 + */ + @GetMapping("/list") + public TableDataInfo list(FmsTempVO fmsTemp) + { + startPage(); + // API Domain → Service DTO + FmsTempDTO dto = FmsTempControllerConvert.toDTO(fmsTemp); + List dtoList = fmsTempService.selectFmsTempList(dto); + // Service DTO → API Domain + List list = FmsTempControllerConvert.toApiDomainList(dtoList); + return getDataTable(list); + } + + /** + * 获取飞行管理临时表详细信息（内部调用） + */ + @InnerAuth + @GetMapping(value = "/{id}") + public R getFmsById(@PathVariable("id") String id) + { + FmsTempDTO dto = fmsTempService.selectFmsTempById(id); + FmsTempVO fmsTemp = FmsTempControllerConvert.toVO(dto); + return R.ok(fmsTemp); + } + + /** + * 获取飞行管理临时表详细信息（外部调用） + */ + @GetMapping(value = "/info/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + FmsTempDTO dto = fmsTempService.selectFmsTempById(id); + FmsTempVO fmsTemp = FmsTempControllerConvert.toVO(dto); + return success(fmsTemp); + } +} diff --git a/src/main/java/com/ruoyi/fms/controller/convert/FmsTempControllerConvert.java b/src/main/java/com/ruoyi/fms/controller/convert/FmsTempControllerConvert.java new file mode 100644 index 0000000..e9d86fb --- /dev/null +++ b/src/main/java/com/ruoyi/fms/controller/convert/FmsTempControllerConvert.java @@ -0,0 +1,58 @@ +package com.ruoyi.fms.controller.convert; + +import com.ruoyi.fms.api.domain.FmsTempVO; +import com.ruoyi.fms.service.dto.FmsTempDTO; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 飞行管理临时表Controller层转换器 + * API Domain ↔ Service DTO + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTempControllerConvert +{ + /** + * DTO 转 API Domain + */ + public static FmsTempVO toVO(FmsTempDTO dto) + { + if (dto == null) + { + return null; + } + FmsTempVO apiDomain = new FmsTempVO(); + BeanUtils.copyProperties(dto, apiDomain); + return apiDomain; + } + + /** + * API Domain 转 DTO + */ + public static FmsTempDTO toDTO(FmsTempVO apiDomain) + { + if (apiDomain == null) + { + return null; + } + FmsTempDTO dto = new FmsTempDTO(); + BeanUtils.copyProperties(apiDomain, dto); + return dto; + } + + /** + * DTO List 转 API Domain List + */ + public static List toApiDomainList(List dtoList) + { + if (dtoList == null) + { + return null; + } + return dtoList.stream().map(FmsTempControllerConvert::toVO).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/ruoyi/fms/domain/api/IFmsTempDomain.java b/src/main/java/com/ruoyi/fms/domain/api/IFmsTempDomain.java new file mode 100644 index 0000000..307aa7f --- /dev/null +++ b/src/main/java/com/ruoyi/fms/domain/api/IFmsTempDomain.java @@ -0,0 +1,29 @@ +package com.ruoyi.fms.domain.api; + +import com.ruoyi.fms.domain.model.FmsTemp; +import java.util.List; + +/** + * 飞行管理临时表Domain接口 + * + * @author ruoyi + * @date 2026-01-17 + */ +public interface IFmsTempDomain +{ + /** + * 查询飞行管理临时表列表 + * + * @param fmsTemp 飞行管理临时表 + * @return 飞行管理临时表集合 + */ + List selectFmsTempList(FmsTemp fmsTemp); + + /** + * 根据ID查询飞行管理临时表 + * + * @param id 主键ID + * @return 飞行管理临时表 + */ + FmsTemp selectFmsTempById(String id); +} diff --git a/src/main/java/com/ruoyi/fms/domain/convert/FmsTempDomainConvert.java b/src/main/java/com/ruoyi/fms/domain/convert/FmsTempDomainConvert.java new file mode 100644 index 0000000..7824f84 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/domain/convert/FmsTempDomainConvert.java @@ -0,0 +1,58 @@ +package com.ruoyi.fms.domain.convert; + +import com.ruoyi.fms.domain.model.FmsTemp; +import com.ruoyi.fms.mapper.entity.FmsTempEntity; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 飞行管理临时表Domain层转换器 + * Domain Model ↔ Mapper Entity + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTempDomainConvert +{ + /** + * Entity 转 Model + */ + public static FmsTemp toModel(FmsTempEntity entity) + { + if (entity == null) + { + return null; + } + FmsTemp model = new FmsTemp(); + BeanUtils.copyProperties(entity, model); + return model; + } + + /** + * Model 转 Entity + */ + public static FmsTempEntity toEntity(FmsTemp model) + { + if (model == null) + { + return null; + } + FmsTempEntity entity = new FmsTempEntity(); + BeanUtils.copyProperties(model, entity); + return entity; + } + + /** + * Entity List 转 Model List + */ + public static List toModelList(List entityList) + { + if (entityList == null) + { + return null; + } + return entityList.stream().map(FmsTempDomainConvert::toModel).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/ruoyi/fms/domain/impl/FmsTempDomainImpl.java b/src/main/java/com/ruoyi/fms/domain/impl/FmsTempDomainImpl.java new file mode 100644 index 0000000..4a803a9 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/domain/impl/FmsTempDomainImpl.java @@ -0,0 +1,39 @@ +package com.ruoyi.fms.domain.impl; + +import com.ruoyi.fms.domain.api.IFmsTempDomain; +import com.ruoyi.fms.domain.convert.FmsTempDomainConvert; +import com.ruoyi.fms.domain.model.FmsTemp; +import com.ruoyi.fms.mapper.FmsTempMapper; +import com.ruoyi.fms.mapper.entity.FmsTempEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 飞行管理临时表Domain实现 + * + * @author ruoyi + * @date 2026-01-17 + */ +@Component +public class FmsTempDomainImpl implements IFmsTempDomain +{ + @Autowired + private FmsTempMapper fmsTempMapper; + + @Override + public List selectFmsTempList(FmsTemp fmsTempModel) + { + FmsTempEntity entity = FmsTempDomainConvert.toEntity(fmsTempModel); + List entityList = fmsTempMapper.selectFmsTempList(entity); + return FmsTempDomainConvert.toModelList(entityList); + } + + @Override + public FmsTemp selectFmsTempById(String id) + { + FmsTempEntity entity = fmsTempMapper.selectFmsTempById(id); + return FmsTempDomainConvert.toModel(entity); + } +} diff --git a/src/main/java/com/ruoyi/fms/domain/model/FmsTemp.java b/src/main/java/com/ruoyi/fms/domain/model/FmsTemp.java new file mode 100644 index 0000000..ffc57f2 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/domain/model/FmsTemp.java @@ -0,0 +1,55 @@ +package com.ruoyi.fms.domain.model; + +import java.io.Serializable; +import java.util.Date; + +/** + * 飞行管理临时表领域模型 + * Domain 层对外暴露的对象 + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTemp implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 创建时间 */ + private Date createTime; + + /** 更新时间 */ + private Date updateTime; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } +} diff --git a/src/main/java/com/ruoyi/fms/mapper/FmsTempMapper.java b/src/main/java/com/ruoyi/fms/mapper/FmsTempMapper.java new file mode 100644 index 0000000..ed355f0 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/mapper/FmsTempMapper.java @@ -0,0 +1,29 @@ +package com.ruoyi.fms.mapper; + +import com.ruoyi.fms.mapper.entity.FmsTempEntity; +import java.util.List; + +/** + * FMS临时表Mapper接口 + * + * @author ruoyi + * @date 2026-01-17 + */ +public interface FmsTempMapper +{ + /** + * 查询FMS临时表列表 + * + * @param fmsTempEntity FMS临时表 + * @return FMS临时表集合 + */ + public List selectFmsTempList(FmsTempEntity fmsTempEntity); + + /** + * 根据ID查询FMS临时表 + * + * @param id 主键ID + * @return FMS临时表 + */ + public FmsTempEntity selectFmsTempById(String id); +} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/fms/mapper/entity/FmsTempEntity.java b/src/main/java/com/ruoyi/fms/mapper/entity/FmsTempEntity.java new file mode 100644 index 0000000..ed9c628 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/mapper/entity/FmsTempEntity.java @@ -0,0 +1,36 @@ +package com.ruoyi.fms.mapper.entity; + +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * FMS临时表实体对象 tuoheng_fms_temp + * Mapper 层实体，对应数据库表 + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTempEntity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + @Override + public String toString() + { + return "FmsTempEntity{" + + "id='" + id + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/fms/service/api/IFmsTempService.java b/src/main/java/com/ruoyi/fms/service/api/IFmsTempService.java new file mode 100644 index 0000000..7bcf020 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/service/api/IFmsTempService.java @@ -0,0 +1,29 @@ +package com.ruoyi.fms.service.api; + +import com.ruoyi.fms.service.dto.FmsTempDTO; +import java.util.List; + +/** + * 飞行管理临时表Service接口 + * + * @author ruoyi + * @date 2026-01-17 + */ +public interface IFmsTempService +{ + /** + * 查询飞行管理临时表列表 + * + * @param fmsTempDTO 飞行管理临时表 + * @return 飞行管理临时表集合 + */ + List selectFmsTempList(FmsTempDTO fmsTempDTO); + + /** + * 根据ID查询飞行管理临时表 + * + * @param id 主键ID + * @return 飞行管理临时表 + */ + FmsTempDTO selectFmsTempById(String id); +} diff --git a/src/main/java/com/ruoyi/fms/service/convert/FmsTempServiceConvert.java b/src/main/java/com/ruoyi/fms/service/convert/FmsTempServiceConvert.java new file mode 100644 index 0000000..fcf8cc4 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/service/convert/FmsTempServiceConvert.java @@ -0,0 +1,58 @@ +package com.ruoyi.fms.service.convert; + +import com.ruoyi.fms.domain.model.FmsTemp; +import com.ruoyi.fms.service.dto.FmsTempDTO; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 飞行管理临时表Service层转换器 + * Service DTO ↔ Domain Model + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTempServiceConvert +{ + /** + * Model 转 DTO + */ + public static FmsTempDTO toDTO(FmsTemp model) + { + if (model == null) + { + return null; + } + FmsTempDTO dto = new FmsTempDTO(); + BeanUtils.copyProperties(model, dto); + return dto; + } + + /** + * DTO 转 Model + */ + public static FmsTemp toModel(FmsTempDTO dto) + { + if (dto == null) + { + return null; + } + FmsTemp model = new FmsTemp(); + BeanUtils.copyProperties(dto, model); + return model; + } + + /** + * Model List 转 DTO List + */ + public static List toDTOList(List modelList) + { + if (modelList == null) + { + return null; + } + return modelList.stream().map(FmsTempServiceConvert::toDTO).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/ruoyi/fms/service/dto/FmsTempDTO.java b/src/main/java/com/ruoyi/fms/service/dto/FmsTempDTO.java new file mode 100644 index 0000000..87b2814 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/service/dto/FmsTempDTO.java @@ -0,0 +1,55 @@ +package com.ruoyi.fms.service.dto; + +import java.io.Serializable; +import java.util.Date; + +/** + * 飞行管理临时表服务层DTO + * Service 层对外暴露的对象 + * + * @author ruoyi + * @date 2026-01-17 + */ +public class FmsTempDTO implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 创建时间 */ + private Date createTime; + + /** 更新时间 */ + private Date updateTime; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } +} diff --git a/src/main/java/com/ruoyi/fms/service/impl/FmsTempServiceImpl.java b/src/main/java/com/ruoyi/fms/service/impl/FmsTempServiceImpl.java new file mode 100644 index 0000000..56dcc88 --- /dev/null +++ b/src/main/java/com/ruoyi/fms/service/impl/FmsTempServiceImpl.java @@ -0,0 +1,51 @@ +package com.ruoyi.fms.service.impl; + +import com.ruoyi.fms.domain.api.IFmsTempDomain; +import com.ruoyi.fms.domain.model.FmsTemp; +import com.ruoyi.fms.service.api.IFmsTempService; +import com.ruoyi.fms.service.convert.FmsTempServiceConvert; +import com.ruoyi.fms.service.dto.FmsTempDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 飞行管理临时表Service业务层处理 + * + * @author ruoyi + * @date 2026-01-17 + */ +@Service +public class FmsTempServiceImpl implements IFmsTempService +{ + @Autowired + private IFmsTempDomain fmsTempDomain; + + /** + * 查询飞行管理临时表列表 + * + * @param fmsTempDTO 飞行管理临时表 + * @return 飞行管理临时表集合 + */ + @Override + public List selectFmsTempList(FmsTempDTO fmsTempDTO) + { + FmsTemp model = FmsTempServiceConvert.toModel(fmsTempDTO); + List modelList = fmsTempDomain.selectFmsTempList(model); + return FmsTempServiceConvert.toDTOList(modelList); + } + + /** + * 根据ID查询飞行管理临时表 + * + * @param id 主键ID + * @return 飞行管理临时表 + */ + @Override + public FmsTempDTO selectFmsTempById(String id) + { + FmsTemp model = fmsTempDomain.selectFmsTempById(id); + return FmsTempServiceConvert.toDTO(model); + } +} diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 0601ea3..245c73e 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -1,15 +1,19 @@ # Tomcat server: - port: 9201 + port: 9204 # Spring -spring: +spring: application: # 应用名称 name: tuoheng-fms profiles: # 环境配置 active: prod + flyway: + table: flyway_fms_schema_history # 自定义历史表名 + baseline-on-migrate: true # 在nocos中也有配置 + baseline-version: 0 # 在nocos中也有配置 cloud: nacos: discovery: diff --git a/src/main/resources/db/migration/V1__Create_fms_temp_table.sql b/src/main/resources/db/migration/V1__Create_fms_temp_table.sql new file mode 100644 index 0000000..e45d5dd --- /dev/null +++ b/src/main/resources/db/migration/V1__Create_fms_temp_table.sql @@ -0,0 +1,14 @@ +-- ============================================================ +-- Flyway Migration Script +-- ============================================================ +-- Version: V1 +-- Description: Create tuoheng_fms_temp table +-- Author: ruoyi +-- Date: 2026-01-17 +-- ============================================================ + +-- 创建飞行管理临时表 +CREATE TABLE IF NOT EXISTS tuoheng_fms_temp ( + id VARCHAR(64) NOT NULL COMMENT '主键ID', + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='飞行管理临时表'; diff --git a/src/main/resources/mapper/fms/FmsTempMapper.xml b/src/main/resources/mapper/fms/FmsTempMapper.xml new file mode 100644 index 0000000..6656439 --- /dev/null +++ b/src/main/resources/mapper/fms/FmsTempMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + select id from tuoheng_fms_temp + + + + + + +