diff --git a/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java b/cloud-auth/src/main/java/com/muyu/CloudAuthApplication.java similarity index 96% rename from cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java rename to cloud-auth/src/main/java/com/muyu/CloudAuthApplication.java index e6ea4fd..10c268e 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java +++ b/cloud-auth/src/main/java/com/muyu/CloudAuthApplication.java @@ -1,4 +1,4 @@ -package com.muyu.auth; +package com.muyu; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/CloudGatewayApplication.java b/cloud-gateway/src/main/java/com/muyu/CloudGatewayApplication.java similarity index 94% rename from cloud-gateway/src/main/java/com/muyu/gateway/CloudGatewayApplication.java rename to cloud-gateway/src/main/java/com/muyu/CloudGatewayApplication.java index 43c7ed9..cc2a380 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/CloudGatewayApplication.java +++ b/cloud-gateway/src/main/java/com/muyu/CloudGatewayApplication.java @@ -1,4 +1,4 @@ -package com.muyu.gateway; +package com.muyu; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java b/cloud-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java index bd12aad..45f37aa 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author DongZl + * @author zmw * @description: 验证码 * @Date 2023-11-12 下午 03:36 */ diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml new file mode 100644 index 0000000..02d5532 --- /dev/null +++ b/cloud-modules/cloud-modules-car/pom.xml @@ -0,0 +1,103 @@ + + + + com.muyu + cloud-modules + 3.6.3 + + 4.0.0 + + cloud-modules-car + + + cloud-modules-car车辆模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + + + + com.muyu + cloud-common-rabbit + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java new file mode 100644 index 0000000..78bb32d --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java @@ -0,0 +1,21 @@ +package com.muyu; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author muyu + */ +@EnableCustomConfig +//@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class CloudCarApplication { + public static void main (String[] args) { + SpringApplication.run(CloudCarApplication.class, args); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java new file mode 100644 index 0000000..ca27cbe --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java @@ -0,0 +1,40 @@ +package com.muyu.car.controller; + +import cn.hutool.core.util.RandomUtil; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; +import com.muyu.car.service.SysCarCompanyService; +import com.muyu.car.service.SysCarService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.utils.SecurityUtils; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 参数配置 信息操作处理 + * + * @author muyu + */ +@RestController +@RequestMapping("/company") +@Tag(name = "SysCarCompanyController", description = "系统参数配置") +public class SysCarCompanyController extends BaseController { + + @Autowired + private SysCarCompanyService sysCarCompanyService; + + /** + * 查询企业表 + */ + @PostMapping("selectCompany") + public Result selectCompany(){ + return Result.success(sysCarCompanyService.list()); + } + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java new file mode 100644 index 0000000..ca0e9c1 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java @@ -0,0 +1,111 @@ +package com.muyu.car.controller; + +import cn.hutool.core.util.RandomUtil; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; +import com.muyu.car.service.SysCarCompanyService; +import com.muyu.car.service.SysCarService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.utils.SecurityUtils; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.catalina.security.SecurityUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 参数配置 信息操作处理 + * + * @author muyu + */ +@RestController +@RequestMapping("/manage") +@Tag(name = "SysCarController", description = "系统参数配置") +public class SysCarController extends BaseController { + + @Autowired + private SysCarCompanyService sysCarCompanyService; + @Autowired + private SysCarService sysCarService; + + /** + * 车辆列表2 + * @param carDTO + * @return + */ + @PostMapping("CarListShow") + public Result> CarListShow(@RequestBody CarDTO carDTO){ + return Result.success(sysCarService.CarListShow(carDTO)); + } + + /** + * 通过id查询 + * @param carId + * @return + */ + @PostMapping("CarListShowByCarId") + public Result> CarListShowByCarId(@RequestParam("carId") Long carId){ + return Result.success(sysCarService.CarListShowByCarId(carId)); + } + + /** + * 车辆列表1 + * @param carVO + * @return + */ + @PostMapping("CarList") + @Operation(summary = "查询列表",description = "车辆管理列表") + public Result> CarList(@RequestBody CarVO carVO){ + startPage(); + return getDataTable(sysCarService.carList(carVO)); + } + + + /** + * 车辆添加 + * @param carVO + * @return + */ + @PostMapping("insertCar") + public Result insertCar(@RequestBody CarVO carVO){ + String key = RandomUtil.randomNumbers(9); + // 随机生成车架号 + carVO.setCarFrame(key); + // 随机生成VIN码 + String key2 = RandomUtil.randomNumbers(17); + carVO.setCarVin(key2); + // + carVO.setUserId(SecurityUtils.getUserId()); + sysCarService.insertCar(carVO); + return Result.success("车辆添加成功"); + } + + + /** + * 车辆修改 + * @param carVO + * @return + */ + @PostMapping("updataCar") + public Result updataCar(@RequestBody CarVO carVO){ + sysCarService.updateById(carVO); + return Result.success("车辆修改成功"); + } + + /** + * 车辆删除 + * @param ids + * @return + */ + @PostMapping("deleteCar") + public Result deleteCar(@RequestParam("ids") List ids){ + sysCarService.deleteCar(ids); + return Result.success("车辆删除成功"); + } + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java new file mode 100644 index 0000000..40e12f1 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java @@ -0,0 +1,26 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_company") +public class CarCompany { + /** + * 企业表 + */ + @TableId(value = "company_id",type = IdType.AUTO) + private Long companyId; + /** + * 企业名称 + */ + private String companyName; +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java new file mode 100644 index 0000000..51f9aa3 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java @@ -0,0 +1,63 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_car_message") +public class CarMessage { + /** + * 报文表 + */ + @TableId(value = "message_id",type = IdType.AUTO) + private Long messageId; + /** + * 车辆编码 + */ + private String messageCode; + /** + * 车辆报文类别 + */ + private String messageType; + /** + * 开始位下标 + */ + private Integer messageStartIndex; + /** + * 结束位下标 + */ + private Integer messageEndIndex; + /** + * 数据类型 + */ + private String messageDataType; + /** + * 固定值 + */ + private double fixedValue; + /** + * 最小值 + */ + private double minimumValue; + /** + * 最大值 + */ + private double maximumValue; + /** + * 模版id + */ + private Long templateId; + /** + * 报文标签 + */ + private String messageLabel; + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java new file mode 100644 index 0000000..ab45d45 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java @@ -0,0 +1,40 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_message_type") +public class CarMessageType { + /** + * 报文 + */ + @TableId(value = "message_type_id",type = IdType.AUTO) + private Integer messageTypeId; + /** + * 报文编码 + */ + private String messageCode; + /** + * 报文名称 + */ + private String messageName; + /** + * 报文分类 + */ + private String messageType; + /** + * 报文字段类型 + */ + private String messageClass; + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java new file mode 100644 index 0000000..c8745ea --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java @@ -0,0 +1,36 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_template") +public class CarTemplate { + + /** + * 报文模版表 + */ + @TableId(value = "template_id",type = IdType.AUTO) + private Integer templateId; + /** + * 报文模版名称 + */ + private String templateName; + /** + * 报文模版描述 + */ + private String templateDescribe; + /** + * 备注 + */ + private String remark; + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java new file mode 100644 index 0000000..3d357f8 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java @@ -0,0 +1,102 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_car") +public class SysCar { + /** + * 车辆表 + */ + @TableId(value = "car_id",type = IdType.AUTO) + private Long carId; + /** + * 车架号 + */ + private String carFrame; + /** + * 车牌号 + */ + private String carCoed; + /** + * 车牌颜色 1.白色 2.绿色 3.黑色 4.银色 5.红色 + */ + private Integer carColor; + /** + * VIN码 + */ + private String carVin; + /** + * 驾车人 + */ + private Long carUserId; + /** + * 车主 + */ + private Long userId; + /** + * 车辆配置 + */ + private Long typeId; + + /** 车辆品牌 */ + @Excel(name = "车辆品牌") + private String carBrand; + + /** 车辆型号 */ + @Excel(name = "车辆型号") + private String carModel; + /** + * 年审日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date audditTime; + /** + * 行驶证到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date licenseTime; + /** + * 保险到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date insuranceTime; + /** + * 在线状态 1.无信号 2.行驶中 3.已停止 + */ + private Integer carStatus; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + /** + * 当前档位 + */ + private Integer carGears; + + + /** 最后一次连线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后一次连线时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date carLastJoinTime; + + /** 最后一次离线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后一次离线时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date carLastOfflineTime; + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java new file mode 100644 index 0000000..98bbf9f --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java @@ -0,0 +1,53 @@ +package com.muyu.car.domain.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CarDTO { + + /** + * VIN码 + */ + private String carVin; + + + /** + * 车辆型号 + */ + private String typeName; + /** + * 能源类型 1.电动 2.纯油 3.混动 + */ + @TableField(exist = false) + private Integer energyType; + /** + * 档的类型 1.手动 2.自动 + */ + @TableField(exist = false) + private Integer gearType; + + private Integer pageNum = 1; + private Integer pageSize = 3; + + /** 最后一次连线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date carLastJoinTime; + + /** 最后一次离线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date carLastOfflineTime; + /** + * 在线状态 1.无信号 2.行驶中 3.已停止 + */ + private Integer carStatus; +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java new file mode 100644 index 0000000..5d39014 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java @@ -0,0 +1,123 @@ +package com.muyu.car.domain.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_car",autoResultMap = true) +public class CarVO { + /** + * 车辆表 + */ + @TableId(value = "car_id",type = IdType.AUTO) + private Integer carId; + /** + * 车架号 + */ + private String carFrame; + /** + * 车牌号 + */ + private String carCoed; + /** + * 车牌颜色 1.白色 2.绿色 3.黑色 4.银色 5.红色 + */ + private Integer carColor; + /** + * VIN码 + */ + private String carVin; + /** + * 驾车人 + */ + private Long carUserId; + /** + * 车主 + */ + private Long userId; + /** + * 车辆配置 + */ + private Integer typeId; + /** + * 年审日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date audditTime; + /** + * 行驶证到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date licenseTime; + /** + * 保险到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date insuranceTime; + /** + * 在线状态 1.无信号 2.行驶中 3.已停止 + */ + private Integer carStatus; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + /** + * 当前档位 + */ + private Integer carGears; + + /** 车辆品牌 */ + private String carModel; + /** + * 车辆型号 + */ + private String carBrand; + + /** 最后一次连线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date carLastJoinTime; + + /** 最后一次离线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date carLastOfflineTime; + + + /** 所属企业 */ + private Long companyId; + + /** 车辆车型(如客车,卡车,公交车等) */ + private String carType; + + /** + * 车辆型号 + */ + @TableField(exist = false) + private String typeName; + + /** + * 能源类型 1.电动 2.纯油 3.混动 + */ + @TableField(exist = false) + private Integer energyType; + /** + * 档的类型 1.手动 2.自动 + */ + @TableField(exist = false) + private Integer gearType; + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java new file mode 100644 index 0000000..6bd70c1 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java @@ -0,0 +1,19 @@ +package com.muyu.car.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.car.domain.CarCompany; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; + +import java.util.List; + + +/** + * @author zmw + * @description: 配置mybatis配置 + * @Date 2023-11-13 上午 10:05 + */ +public interface SysCarCompanyMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java new file mode 100644 index 0000000..6df0b88 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java @@ -0,0 +1,39 @@ +package com.muyu.car.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.car.domain.SysCar; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * @author zmw + * @description: 配置mybatis配置 + * @Date 2023-11-13 上午 10:05 + */ +public interface SysCarMapper extends BaseMapper { + /** + * 车辆列表 + * @param queryWrapper + * @return + */ + List carList(LambdaQueryWrapper queryWrapper); + + /** + * 车辆列表2 + * @param carDTO + * @return + */ + List CarListShow(CarDTO carDTO); + + /** + * 通过id查询 + * @param carId + * @return + */ + List CarListShowByCarId(@Param("carId") Long carId); +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java new file mode 100644 index 0000000..9cde805 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java @@ -0,0 +1,22 @@ +package com.muyu.car.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.car.domain.CarCompany; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; + +import java.util.List; + +/** + * @author zmw + * @description: 配置plus业务层 + * @Date 2023-11-13 上午 10:06 + */ +public interface SysCarCompanyService extends IService { + + /** + * 查询企业表 + * @return + */ + //List selectCompany(); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java new file mode 100644 index 0000000..f08bfca --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java @@ -0,0 +1,54 @@ +package com.muyu.car.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.car.domain.CarCompany; +import com.muyu.car.domain.SysCar; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; + +import java.util.List; + +/** + * @author zmw + * @description: 配置plus业务层 + * @Date 2023-11-13 上午 10:06 + */ +public interface SysCarService extends IService { + /** + * 车辆列表 + * @param carVO + * @return + */ + List carList(CarVO carVO); + + /** + * 车辆添加 + * @param carVO + */ + void insertCar(CarVO carVO); + + /** + * 车辆删除 + * @param ids + */ + void deleteCar(List ids); + +// /** +// * 车辆修改 +// * @param carVO +// */ +// void updataCar(CarVO carVO); + + /** + * 车辆列表2 + * @param carDTO + * @return + */ + List CarListShow(CarDTO carDTO); + + /** + * 通过id查询 + * @param carId + * @return + */ + List CarListShowByCarId(Long carId); +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarCompanyServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarCompanyServiceImpl.java new file mode 100644 index 0000000..b923b32 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarCompanyServiceImpl.java @@ -0,0 +1,36 @@ +package com.muyu.car.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.car.domain.CarCompany; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; +import com.muyu.car.mapper.SysCarCompanyMapper; +import com.muyu.car.mapper.SysCarMapper; +import com.muyu.car.service.SysCarCompanyService; +import com.muyu.car.service.SysCarService; +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zmw + * @description: 配置plus业务实现层 + * @Date 2023-11-13 上午 10:06 + */ +@Service +public class SysCarCompanyServiceImpl extends ServiceImpl + implements SysCarCompanyService { + + @Autowired + private RedisService redisService; + @Autowired + private SysCarCompanyMapper sysCarCompanyMapper; + + +// @Override +// public List selectCompany() { +// return sysCarCompanyMapper.; +// } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java new file mode 100644 index 0000000..38c062a --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java @@ -0,0 +1,128 @@ +package com.muyu.car.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.car.domain.CarCompany; +import com.muyu.car.domain.SysCar; +import com.muyu.car.domain.dto.CarDTO; +import com.muyu.car.domain.vo.CarVO; +import com.muyu.car.mapper.SysCarMapper; +import com.muyu.car.service.SysCarService; +import com.muyu.common.redis.service.RedisService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zmw + * @description: 配置plus业务实现层 + * @Date 2023-11-13 上午 10:06 + */ +@Service +public class SysCarServiceImpl extends ServiceImpl + implements SysCarService { + + @Autowired + private RedisService redisService; + @Autowired + private SysCarMapper carMapper; + + /** + * 车辆列表 + * @param carVO + * @return + */ + @Override + public List carList(CarVO carVO) { + +// MPJLambdaWrapper queryWrapper = new MPJLambdaWrapper<>(); +// carMapper.selectJoinList(CarVO.class, +// queryWrapper.selectAll(CarVO.class)// 主表查询所有 +// .select(Type::getTypeName)// 获取附表的字段 +// .select(Type::getEnergyType) +// .select(Type::getGearType) +// .leftJoin(Type.class,Type::getTypeId,Car::getTypeId)// 左链接 +// ); +// // vin码--精确 +// if(StringUtils.isNotEmpty(carVO.getCarVin())){ +// queryWrapper.eq(CarVO::getCarVin,carVO.getCarVin()); +// } +// // 车辆型号 +// if(StringUtils.isNotEmpty(carVO.getTypeName())){ +// queryWrapper.like(CarVO::getTypeName,carVO.getTypeName()); +// } +// // 能源类型 1.电动 2.纯油 3.混动 +// if(carVO.getEnergyType()>0){ +// queryWrapper.eq(CarVO::getEnergyType,carVO.getEnergyType()); +// } +// // 档的类型 1.手动 2.自动 +// if(carVO.getGearType()>0){ +// queryWrapper.eq(CarVO::getGearType,carVO.getGearType()); +// } +// // 自定义列表查询 +//// @Select("") +//// this.list(queryWrapper); +// // mybatis列表查询 +// //return carMapper.carList(queryWrapper); +// // 单表的列表查询 +// this.list( +// new LambdaQueryWrapper() +// .eq(StringUtils.isNotEmpty(carVO.getCarVin()),CarVO::getCarVin,carVO.getCarVin()) +// .eq(carVO.getEnergyType()>0,CarVO::getEnergyType,carVO.getEnergyType()) +// .eq(carVO.getGearType()>0,CarVO::getGearType,carVO.getGearType()) +// .like(StringUtils.isNotEmpty(carVO.getTypeName()),CarVO::getTypeName,carVO.getTypeName()) +// ); +// return this.list(queryWrapper); + return null; + } + + /** + * 车辆添加 + * @param carVO + */ + @Override + public void insertCar(CarVO carVO) { + carMapper.insert(carVO); + } + +// /** +// * 车辆修改 +// * @param carVO +// */ +// @Override +// public void updataCar(CarVO carVO) { +// carMapper.updateById(carVO); +// } + + /** + * 车辆列表2 + * @param carDTO + * @return + */ + @Override + public List CarListShow(CarDTO carDTO) { + return carMapper.CarListShow(carDTO); + } + + /** + * 通过id查询 + * @param carId + * @return + */ + @Override + public List CarListShowByCarId(Long carId) { + return carMapper.CarListShowByCarId(carId); + } + + + /** + * 车辆删除 + * @param ids + */ + @Override + public void deleteCar(List ids) { + carMapper.deleteBatchIds(ids); + } + +} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/banner.txt b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..d1b5629 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..76a0d8f --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml new file mode 100644 index 0000000..2cd69e4 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/SysCarMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/SysCarMapper.xml new file mode 100644 index 0000000..57b12c5 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/SysCarMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/CloudFileApplication.java similarity index 95% rename from cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java rename to cloud-modules/cloud-modules-file/src/main/java/com/muyu/CloudFileApplication.java index 4e1c628..67b4f37 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/CloudFileApplication.java @@ -1,4 +1,4 @@ -package com.muyu.file; +package com.muyu; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/CloudGenApplication.java similarity index 96% rename from cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java rename to cloud-modules/cloud-modules-gen/src/main/java/com/muyu/CloudGenApplication.java index 3cb1f39..53a3fe9 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/CloudGenApplication.java @@ -1,4 +1,4 @@ -package com.muyu.gen; +package com.muyu; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/CloudSystemApplication.java similarity index 95% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java rename to cloud-modules/cloud-modules-system/src/main/java/com/muyu/CloudSystemApplication.java index b01e5db..6c62c18 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/CloudSystemApplication.java @@ -1,4 +1,4 @@ -package com.muyu.system; +package com.muyu; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java index 69294b6..9c47e87 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java @@ -11,7 +11,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author zmw * @description: 授权角色返回结果集 * @Date 2023-6-19 下午 02:50 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java index cd72807..cfb79ea 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java @@ -10,7 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author zmw * @description: 部门树返回结果集 * @Date 2023-6-19 下午 02:52 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java index 21d9808..ac4939b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @author DongZl + * @author zmw * @description: 个人信息模型对象 * @Date 2023-6-19 下午 02:05 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java index 696763e..a61b8b3 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java @@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author zmw * @description: 角色返回菜单树 * @Date 2023-6-19 下午 02:40 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java index 4c61832..0778a0d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java @@ -10,7 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author zmw * @description: 用户详细信息 * @Date 2023-6-19 下午 02:45 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java index d15a760..1c7f99f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java @@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.Set; /** - * @author DongZl + * @author zmw * @description: 用户信息结果集 * @Date 2023-6-19 下午 02:42 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java index ced239a..2e63dfc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysConfig; /** - * @author DongZl + * @author zmw * @description: 配置mybatis配置 * @Date 2023-11-13 上午 10:05 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index f23d67e..8da2c4c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -6,7 +6,7 @@ import com.muyu.system.domain.SysConfig; import java.util.List; /** - * @author DongZl + * @author zmw * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index bc07cc8..9964c1a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Objects; /** - * @author DongZl + * @author zmw * @description: 配置plus业务实现层 * @Date 2023-11-13 上午 10:06 */ diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index bbecb9d..86f9f3b 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -13,6 +13,7 @@ cloud-modules-gen cloud-modules-file cloud-modules-fault + cloud-modules-car cloud-modules diff --git a/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/CloudMonitorApplication.java b/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/CloudMonitorApplication.java similarity index 92% rename from cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/CloudMonitorApplication.java rename to cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/CloudMonitorApplication.java index e230689..d15e6f0 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/CloudMonitorApplication.java +++ b/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/CloudMonitorApplication.java @@ -1,4 +1,4 @@ -package com.muyu.modules.monitor; +package com.muyu; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication;