* Mysql代码生成器 *
- * */ public class MysqlGenerator extends SuperGenerator { @@ -36,10 +35,10 @@ public class MysqlGenerator extends SuperGenerator { * MySQL generator * */ - public void generator(String tableName) { + public void generator(String tableName, String tablePrefix, String modelName) { // 代码生成器 - AutoGenerator mpg = getAutoGenerator(tableName); + AutoGenerator mpg = getAutoGenerator(tableName, tablePrefix, modelName); mpg.execute(); if (tableName == null) { System.err.println(" Generator Success !"); @@ -51,9 +50,13 @@ public class MysqlGenerator extends SuperGenerator { public static void main(String[] args) { MysqlGenerator mysqlGenerator = new MysqlGenerator(); -// Arrays.asList("user","role","user_role").stream().forEach(table -> { - Arrays.asList("fms_ac_aircraft_device").stream().forEach(table -> { - mysqlGenerator.generator(table); + Arrays.asList( + //表名，去除前缀，模块名 + new String[]{"fms_ac_aircraft_device", "fms_ac_", "aircraft"}, + new String[]{"fms_ac_aircraft_insurance", "fms_ac_", "aircraft"}, + new String[]{"fms_ac_aircraft_maintenance", "fms_ac_", "aircraft"} + ).forEach(pair -> { + mysqlGenerator.generator(pair[0], pair[1], pair[2]); }); } diff --git a/aircraft-system/src/main/java/com/aircraft/generate/SuperGenerator.java b/aircraft-system/src/main/java/com/aircraft/generate/SuperGenerator.java index b8f1296..736a8a6 100644 --- a/aircraft-system/src/main/java/com/aircraft/generate/SuperGenerator.java +++ b/aircraft-system/src/main/java/com/aircraft/generate/SuperGenerator.java @@ -1,6 +1,7 @@ package com.aircraft.generate; +import com.aircraft.utils.StringUtils; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.generator.AutoGenerator; @@ -40,7 +41,7 @@ public class SuperGenerator { * * @return */ - protected InjectionConfig getInjectionConfig() { + protected InjectionConfig getInjectionConfig(String moduleName) { return new InjectionConfig() { @Override public void initMap() { @@ -52,6 +53,9 @@ public class SuperGenerator { // 自定义输出文件目录 @Override public String outputFile(TableInfo tableInfo) { + if (StringUtils.isNoneBlank(moduleName)){ + return getResourcePath() + "/mapper/" + moduleName + "/" + tableInfo.getEntityName() + "Mapper.xml"; + } return getResourcePath() + "/mapper/" + tableInfo.getEntityName() + "Mapper.xml"; } })); @@ -62,9 +66,10 @@ public class SuperGenerator { * * @return */ - protected PackageConfig getPackageConfig() { + protected PackageConfig getPackageConfig(String moduleName) { return new PackageConfig() - .setParent("com.aircraft.modules.system") + .setParent("com.aircraft.modules") + .setModuleName(moduleName) .setController("controller") .setEntity("domain") .setMapper("mapper") @@ -78,10 +83,10 @@ public class SuperGenerator { * @param tableName * @return */ - protected StrategyConfig getStrategyConfig(String tableName) { + protected StrategyConfig getStrategyConfig(String tableName,String tablePrefix) { return new StrategyConfig() .setCapitalMode(false)// 全局大写命名 -// .setTablePrefix("sys_")// 去除前缀 + .setTablePrefix(tablePrefix)// 去除前缀 .setNaming(NamingStrategy.underline_to_camel)// 表名生成策略 //.setInclude(new String[] { "user" }) // 需要生成的表 //自定义实体父类 @@ -213,18 +218,18 @@ public class SuperGenerator { * @param tableName * @return */ - protected AutoGenerator getAutoGenerator(String tableName) { + protected AutoGenerator getAutoGenerator(String tableName,String tablePrefix,String moduleName) { return new AutoGenerator() // 全局配置 .setGlobalConfig(getGlobalConfig()) // 数据源配置 .setDataSource(getDataSourceConfig()) // 策略配置 - .setStrategy(getStrategyConfig(tableName)) + .setStrategy(getStrategyConfig(tableName,tablePrefix)) // 包配置 - .setPackageInfo(getPackageConfig()) + .setPackageInfo(getPackageConfig(moduleName)) // 注入自定义配置，可以在 VM 中使用 cfg.abc 设置的值 - .setCfg(getInjectionConfig()) + .setCfg(getInjectionConfig(moduleName)) .setTemplate(getTemplateConfig()); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftDeviceController.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftDeviceController.java new file mode 100644 index 0000000..d667b8a --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftDeviceController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.aircraft.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 飞行器设备表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@RestController +@RequestMapping("/aircraft/aircraftDevice") +public class AircraftDeviceController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftInsuranceController.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftInsuranceController.java new file mode 100644 index 0000000..9c41937 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftInsuranceController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.aircraft.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 飞行器保险表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@RestController +@RequestMapping("/aircraft/aircraftInsurance") +public class AircraftInsuranceController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftMaintenanceController.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftMaintenanceController.java new file mode 100644 index 0000000..687a55f --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/controller/AircraftMaintenanceController.java @@ -0,0 +1,21 @@ +package com.aircraft.modules.aircraft.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 飞行器维保表 前端控制器 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@RestController +@RequestMapping("/aircraft/aircraftMaintenance") +public class AircraftMaintenanceController { + +} + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java new file mode 100644 index 0000000..e7e853a --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftDevice.java @@ -0,0 +1,69 @@ +package com.aircraft.modules.aircraft.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.aircraft.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 飞行器设备表 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_ac_aircraft_device") +public class AircraftDevice extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 飞行器名称 + */ + private String name; + + /** + * 设备型号 + */ + private String model; + + /** + * 品牌（DJI，SF） + */ + private String brand; + + /** + * 类型：0-载物飞行，1-载人飞行，2-其他 + */ + private Integer useType; + + /** + * 区域id + */ + private Long areaId; + + /** + * 景区id + */ + private Long scenicId; + + /** + * 飞行员（负责人）id + */ + private Long employeesId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftInsurance.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftInsurance.java new file mode 100644 index 0000000..7f11b03 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftInsurance.java @@ -0,0 +1,50 @@ +package com.aircraft.modules.aircraft.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.aircraft.base.BaseEntity; +import java.util.Date; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 飞行器保险表 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_ac_aircraft_insurance") +public class AircraftInsurance extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 飞行器id + */ + private Long aircraftId; + + /** + * 保险名称 + */ + private String name; + + /** + * 保险类型：0-三方险，1-设备险，2-运营险 + */ + private Integer insuranceType; + + /** + * 截止日期 + */ + private Date deadlineTime; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftMaintenance.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftMaintenance.java new file mode 100644 index 0000000..6ea1af4 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/domain/AircraftMaintenance.java @@ -0,0 +1,44 @@ +package com.aircraft.modules.aircraft.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.aircraft.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *+ * 飞行器维保表 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_ac_aircraft_maintenance") +public class AircraftMaintenance extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 飞行器id + */ + private Long aircraftId; + + /** + * 飞行员（负责人）id + */ + private Long employeesId; + + /** + * 维保类型（0-例行检查，1-电池损坏） + */ + private Integer maintenanceType; + + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/aircraft/mapper/AircraftDeviceMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/mapper/AircraftDeviceMapper.java new file mode 100644 index 0000000..a66cb78 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/aircraft/mapper/AircraftDeviceMapper.java @@ -0,0 +1,16 @@ +package com.aircraft.modules.aircraft.mapper; + +import com.aircraft.modules.aircraft.domain.AircraftDevice; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 飞行器设备表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftDeviceMapper extends BaseMapper+ * 飞行器保险表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftInsuranceMapper extends BaseMapper+ * 飞行器维保表 Mapper 接口 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftMaintenanceMapper extends BaseMapper+ * 飞行器设备表 服务类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftDeviceService extends IService+ * 飞行器保险表 服务类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftInsuranceService extends IService+ * 飞行器维保表 服务类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +public interface AircraftMaintenanceService extends IService+ * 飞行器设备表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Service +public class AircraftDeviceServiceImpl extends ServiceImpl+ * 飞行器保险表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Service +public class AircraftInsuranceServiceImpl extends ServiceImpl+ * 飞行器维保表 服务实现类 + *
+ * + * @author cli + * @since 2025-07-11 + */ +@Service +public class AircraftMaintenanceServiceImpl extends ServiceImpl+ * 飞行器设备表 + *
+ * + * @author cli + * @since 2025-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fms_ac_aircraft_device") +public class AircraftDevice extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @NotNull(groups = Update.class) + @ApiModelProperty(value = "ID", hidden = true) + private Long id; + + /** + * 飞行器名称 + */ + @NotBlank + @ApiModelProperty(value = "飞行器名称") + private String name; + + /** + * 设备型号 + */ + @NotBlank + @ApiModelProperty(value = "设备型号") + private String model; + + /** + * 品牌（DJI，SF） + */ + @NotBlank + @ApiModelProperty(value = "品牌（DJI，SF）") + private String brand; + + /** + * 类型：0-载物飞行，1-载人飞行，2-其他 + */ + @NotBlank + @ApiModelProperty(value = "类型：0-载物飞行，1-载人飞行，2-其他") + private Integer useType; + + /** + * 区域id + */ + @NotNull + @ApiModelProperty(value = "区域id") + private Long areaId; + + /** + * 景区id + */ + @NotNull + @ApiModelProperty(value = "景区id") + private Long scenicId; + + /** + * 飞行员（负责人）id + */ + @NotNull + @ApiModelProperty(value = "行员（负责人）id") + private Long employeesId; + + /** + * 备注 + */ + @NotBlank + @Max(200) + @ApiModelProperty(value = "备注") + private String remark; + + + @NotNull + @ApiModelProperty("无人机图片") + private List