diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java index 8518d7b..64be725 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java @@ -31,4 +31,5 @@ public class CarCompany { * 企业名称 */ private String companyName; + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java index ecb8560..1a6fcc8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java @@ -29,20 +29,17 @@ public class CarConfig { @TableId(value = "config_id",type = IdType.AUTO) private Long configId; /** - * 车辆配置 1.电动 2.纯油 3.混动 + * 车辆配置 */ private String configName; /** - * 能源类型 + * 能源类型 1.电动 2.纯油 3.混动 */ - private String energyType; + private Integer energyType; /** * 档的类型 1.手动 2.自动 */ private Integer gearType; - /** - * 报文id - */ - private Integer companyId; + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java index d77a132..ac5dce5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java @@ -73,7 +73,7 @@ public class CarManage { /** * 在线状态 1.无信号 2.行驶中 3.已停止 */ - private Integer carStayus; + private Integer carStatus; /** * 创建时间 */ @@ -90,7 +90,7 @@ public class CarManage { /** * 车辆型号 */ - private String cardDrand; + private String carBrand; /** 最后一次连线时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -106,9 +106,6 @@ public class CarManage { * 汽车所属企业id */ private Long companyId; - /** - * 车辆类型 1.轿车 2.跑车 3.越野 4.客车 5.公交 6.其他 - */ - private Integer carType; + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java index f01dd52..5a4f1ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java @@ -19,21 +19,17 @@ public class CarDTO { * VIN码 */ private String carVin; - - /** - * 车辆型号 + * 车辆企业 */ - private String typeName; + private Long companyId; /** * 能源类型 1.电动 2.纯油 3.混动 */ - @TableField(exist = false) private Integer energyType; /** * 档的类型 1.手动 2.自动 */ - @TableField(exist = false) private Integer gearType; private Integer pageNum = 1; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java index 3160b35..0167013 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java @@ -31,7 +31,7 @@ public class CarVO { /** * 车牌号 */ - private String carCoed; + private String carCode; /** * 车牌颜色 1.白色 2.绿色 3.黑色 4.银色 5.红色 */ @@ -47,7 +47,7 @@ public class CarVO { /** * 车辆配置 */ - private Integer typeId; + private Long configId; /** * 年审日期 */ @@ -96,14 +96,16 @@ public class CarVO { /** 所属企业 */ private Long companyId; - /** 车辆车型(如客车,卡车,公交车等) */ - private String carType; + + +// /** 车辆车型(如客车,卡车,公交车等) */ +// private String carType; /** - * 车辆型号 + * 车辆配置 */ @TableField(exist = false) - private String typeName; + private String configName; /** * 能源类型 1.电动 2.纯油 3.混动 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java index 9390ecd..bdca8a8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java @@ -18,7 +18,7 @@ import java.util.List; * @Date 2024/9/28 16:52 */ @RestController -@RequestMapping("/company") +@RequestMapping("/carCompany") @Tag(name = "CarCompanyController", description = "企业表") public class CarCompanyController extends BaseController { @@ -38,7 +38,7 @@ public class CarCompanyController extends BaseController { */ @PostMapping("selectCompanyByCompanyId") public Result selectCompanyByCompanyId(@RequestParam("companyId") Long companyId){ - return Result.success(sysCarCompanyService.getById(companyId)); + return Result.success(sysCarCompanyService.selectCompanyByCompanyId(companyId)); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java new file mode 100644 index 0000000..42c6e31 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java @@ -0,0 +1,44 @@ +package com.muyu.enterprise.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.enterprise.domain.CarCompany; +import com.muyu.enterprise.service.CarCompanyService; +import com.muyu.enterprise.service.CarConfigService; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 车辆配置--控制层 + * @ClassName CarCompanyController + * @Description 车辆配置 Controller 层 + * @author MingWei.Zong + * @Date 2024/9/28 16:52 + */ +@RestController +@RequestMapping("/carConfig") +@Tag(name = "CarConfigController", description = "车辆配置") +public class CarConfigController extends BaseController { + + @Autowired + private CarConfigService carConfigService; + + /** + * 通过 configId 查询企业 + * @param configId + * @return + */ + @PostMapping("selectByConfigId") + public Result selectByConfigId(@RequestParam("configId") Long configId){ + return Result.success(carConfigService.selectByConfigId(configId)); + } + + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java index 837e7fd..3557977 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java @@ -38,12 +38,22 @@ public class CarManageController extends BaseController { /** - * 车辆列表2 + * 车辆列表 单表拼接 + * @param carDTO + * @return + */ + @PostMapping("carListShow2") + public Result> carListShow2(@RequestBody CarDTO carDTO){ + return Result.success(sysCarService.carListShow2(carDTO)); + } + + /** + * 车辆列表 联查 * @param carDTO * @return */ @PostMapping("CarListShow") - public Result> CarListShow(@RequestBody CarDTO carDTO){ + public Result> CarListShow(@RequestBody CarDTO carDTO){ return Result.success(sysCarService.CarListShow(carDTO)); } @@ -57,18 +67,6 @@ public class CarManageController extends BaseController { return Result.success(sysCarService.getById(carId)); } -// /** -// * 车辆列表1 -// * @param carVO -// * @return -// */ -// @PostMapping("CarList") -// @Operation(summary = "查询列表",description = "车辆管理列表") -// public Result> CarList(@RequestBody CarVO carVO){ -// startPage(); -// return getDataTable(sysCarService.carList(carVO)); -// } - /** * 车辆添加 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java index 88e7e3d..c71f571 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java @@ -41,8 +41,7 @@ public class CarMessageController extends BaseController { */ @GetMapping("/selectByTemplateId") private Result> selectByTemplateId(@RequestParam("templateId") Integer templateId) { - return Result.success(sysCarMessageService.list - (new LambdaQueryWrapper().eq(CarMessage::getTemplateId, templateId))); + return Result.success(sysCarMessageService.list(new LambdaQueryWrapper().eq(CarMessage::getTemplateId, templateId))); } /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java index 6e12c8c..7169683 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java @@ -32,21 +32,17 @@ public class CarMessageTypeController extends BaseController { */ @PostMapping("messageTypeList") public Result messageTypeList(){ - sysCarMessageTypeService.messageTypeList(); List list = sysCarMessageTypeService.list(); return Result.success(list); } + /** + * 添加报文类型 + * @param carMessageType + * @return + */ @PostMapping("inserMessageType") public Result inserMessageType(@RequestBody CarMessageType carMessageType){ - /** id 检验 */ - if(carMessageType.getMessageTypeId()>0){ - return Result.error("添加要什么id"); - } - /** token 检验 */ - if(SecurityUtils.getToken().isEmpty()){ - return Result.error("token不为空"); - } /** 报文类型 */ if(StringUtils.isEmpty(carMessageType.getMessageType())){ return Result.error("报文类型不能为空"); @@ -74,13 +70,21 @@ public class CarMessageTypeController extends BaseController { */ @PostMapping("updateMessageType") public Result updateMessageType(@RequestBody CarMessageType carMessageType){ - /** id */ - if(carMessageType.getMessageTypeId() < 0 ){ - return Result.error("修改需要id"); + /** 报文类型 */ + if(StringUtils.isEmpty(carMessageType.getMessageType())){ + return Result.error("报文类型不能为空"); } - /** 报文编号 */ + /** 报文 */ + if(StringUtils.isEmpty(carMessageType.getMessageName())){ + return Result.error("报文不能为空"); + } + /** 报文编码 */ if(StringUtils.isEmpty(carMessageType.getMessageCode())){ - return Result.error(""); + return Result.error("报文编码不能为空"); + } + /** 报文字段类型 */ + if(StringUtils.isEmpty(carMessageType.getMessageClass())){ + return Result.error("报文字段类型不能为空"); } sysCarMessageTypeService.updateById(carMessageType); return Result.success("修改成功"); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java new file mode 100644 index 0000000..a3aafcb --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java @@ -0,0 +1,22 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.muyu.enterprise.domain.CarConfig; +import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.vo.CarVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 车辆配置--持久层 + * @ClassName CarManageMapper + * @Description 车辆配置 Mapper 层 + * @author MingWei.Zong + * @Date 2024/9/28 16:52 + */ + +public interface CarConfigMapper extends MPJBaseMapper { + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java index 0e4dc8a..5117d62 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java @@ -2,9 +2,12 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.enterprise.domain.CarManage; import com.muyu.enterprise.domain.dto.CarDTO; import com.muyu.enterprise.domain.vo.CarVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,26 +19,7 @@ import java.util.List; * @author MingWei.Zong * @Date 2024/9/28 16:52 */ +@Mapper +public interface CarManageMapper extends MPJBaseMapper { -public interface CarManageMapper 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-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java index e1faeaa..f9ab668 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java @@ -14,10 +14,5 @@ import java.util.List; */ @Mapper public interface CarMessageMapper extends BaseMapper { - /** - * 查询所有报文信息 - * @param templateId - * @return - */ - List selectMessageShow(Long templateId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java index 800d332..be3a5c4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java @@ -14,9 +14,5 @@ import java.util.List; */ @Mapper public interface CarTemplateMapper extends BaseMapper { - /** - * 查询所有报文信息 - * @return - */ - List selectTemplateShow(); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java index 5077a6b..5e8977b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java @@ -10,11 +10,13 @@ import com.muyu.enterprise.domain.CarCompany; * @Date 2024/9/28 16:52 */ public interface CarCompanyService extends IService { - /** - * 查询企业表 + * + * @param companyId * @return */ - //List selectCompany(); + CarCompany selectCompanyByCompanyId(Long companyId); + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java new file mode 100644 index 0000000..bd70068 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java @@ -0,0 +1,25 @@ +package com.muyu.enterprise.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.CarConfig; +import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.dto.CarDTO; +import com.muyu.enterprise.domain.vo.CarVO; + +import java.util.List; + +/** + * 车辆配置--业务层 + * @ClassName CarConfigService + * @Description 车辆配置 Service 层 + * @author MingWei.Zong + * @Date 2024/9/28 16:52 + */ +public interface CarConfigService extends IService { + + /** + * 通过 configId 查询企业 + * @param configId + * @return + */ + CarConfig selectByConfigId(Long configId); +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java index 89e0ba8..58ff3ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java @@ -14,37 +14,22 @@ import java.util.List; * @Date 2024/9/28 16:52 */ public interface CarManageService extends IService { -// /** -// * 车辆列表 -// * @param carVO -// * @return -// */ -// List carList(CarVO carVO); -// -// /** -// * 车辆添加 -// * @param carVO -// */ -// void insertCar(CarVO carVO); -// -// /** -// * 车辆删除 -// * @param ids -// */ -// void deleteCar(List ids); -// -// /** * 车辆列表2 * @param carDTO * @return */ - List CarListShow(CarDTO carDTO); -// -// /** -// * 通过id查询 -// * @param carId -// * @return -// */ -// List CarListShowByCarId(Long carId); + List carListShow2(CarDTO carDTO); + + /** + * 车辆列表 + * @param carDTO + * @return + */ + List CarListShow(CarDTO carDTO); + + + + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java index 3ece603..167bdbb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java @@ -12,5 +12,5 @@ import java.util.List; * @Date 2024/9/28 16:52 */ public interface CarMessageTypeService extends IService { - List messageTypeList(); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java index 00c9610..2ce1df0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java @@ -29,11 +29,17 @@ public class CarCompanyServiceImpl extends ServiceImpl selectCompany() { -// return sysCarCompanyMapper.; -// } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java new file mode 100644 index 0000000..1f14817 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java @@ -0,0 +1,45 @@ +package com.muyu.enterprise.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.enterprise.domain.CarCompany; +import com.muyu.enterprise.domain.CarConfig; +import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.dto.CarDTO; +import com.muyu.enterprise.domain.vo.CarVO; +import com.muyu.enterprise.mapper.CarConfigMapper; +import com.muyu.enterprise.mapper.CarManageMapper; +import com.muyu.enterprise.service.CarCompanyService; +import com.muyu.enterprise.service.CarConfigService; +import com.muyu.enterprise.service.CarManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 车辆配置--业务实现层 + * @ClassName CarConfigServiceImpl + * @Description 车辆配置 ServiceImpl 层 + * @author MingWei.Zong + * @Date 2024/9/28 16:52 + */ +@Service +public class CarConfigServiceImpl extends ServiceImpl + implements CarConfigService { + @Autowired + private CarConfigMapper carConfigMapper; + + /** + * 通过 configId 查询企业 + * @param configId + * @return + */ + @Override + public CarConfig selectByConfigId(Long configId) { + CarConfig carConfig = carConfigMapper.selectById(configId); + return carConfig; + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java index 0796827..72bdf50 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java @@ -2,21 +2,25 @@ package com.muyu.enterprise.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.enterprise.controller.CarCompanyController; import com.muyu.enterprise.domain.CarCompany; +import com.muyu.enterprise.domain.CarConfig; import com.muyu.enterprise.domain.CarManage; import com.muyu.enterprise.domain.dto.CarDTO; import com.muyu.enterprise.domain.vo.CarVO; import com.muyu.enterprise.mapper.CarManageMapper; import com.muyu.enterprise.service.CarCompanyService; +import com.muyu.enterprise.service.CarConfigService; import com.muyu.enterprise.service.CarManageService; import com.muyu.common.redis.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -30,122 +34,56 @@ import java.util.List; public class CarManageServiceImpl extends ServiceImpl implements CarManageService { -// @Autowired -// private RedisService redisService; -// @Autowired -// private CarManageMapper carMapper; -// // 企业 service -// @Autowired -// private CarCompanyService carCompanyService; -// /** -// * 车辆列表 -// * @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); -//// } -// + @Autowired + private CarCompanyService carCompanyService; + @Autowired + private CarConfigService carConfigService; + @Autowired + private CarManageMapper carManageMapper; + /** * 车辆列表2 * @param carDTO * @return */ @Override - public List CarListShow(CarDTO carDTO) { - // 获取 企业 -// CarCompanyController carCompanyController = new CarCompanyController(); + public List carListShow2(CarDTO carDTO) { + // 获取 企业 CarManage carManage = BeanUtil.copyProperties(carDTO, CarManage.class); - return lambdaQuery() - .eq(StringUtils.isNotEmpty(carManage.getCarVin()), CarManage::getCarVin, carManage.getCarVin()) - .eq(carManage.getConfigId() > 0, CarManage::getCarVin, carManage.getConfigId()) + List list = lambdaQuery() + .eq(carManage.getCarVin() != null && carManage.getCarVin() != "", CarManage::getCarVin, carManage.getCarVin()) + .eq(carManage.getConfigId() > 0, CarManage::getConfigId, carManage.getConfigId()) .list(); -// list.forEach(carManage1 -> { -// // 获取 企业 id -// carCompanyController.selectCompanyByCompanyId(carManage1.getCompanyId()); -// }); - // -// List data = carCompanyController.selectCompany().getData(); -// getById() +// List list = list(); + + // 把 查询出来的车辆数据 copy 到 CarVO + List carVOS = BeanUtil.copyToList(list, CarVO.class); + // 遍历赋值 + carVOS.forEach(carVO -> { + // 查询出对象,用于赋值 + CarConfig carConfig = carConfigService.selectByConfigId(carVO.getConfigId()); + carVO.setConfigName(carConfig.getConfigName()); + carVO.setEnergyType(carConfig.getEnergyType()); + carVO.setGearType(carConfig.getGearType()); + // 查询出对象,用于赋值 + CarCompany carCompany = carCompanyService.selectCompanyByCompanyId(carVO.getCompanyId()); + carVO.setCompanyName(carCompany.getCompanyName()); + }); + return carVOS; + } + @Override + public List CarListShow(CarDTO carDTO) { + return carManageMapper.selectJoinList(CarVO.class, new MPJLambdaWrapper() + .selectAll(CarManage.class) // 查询所有车辆表 + .select(CarCompany::getCompanyName) + .select(CarConfig::getConfigName) + .select(CarConfig::getGearType) + .select(CarConfig::getEnergyType) + .leftJoin(CarConfig.class, CarConfig::getConfigId, CarManage::getConfigId) + .leftJoin(CarCompany.class, CarCompany::getCompanyId, CarManage::getCompanyId) + ); } -// -// /** -// * 通过id查询 -// * @param carId -// * @return -// */ -// @Override -// public CarManage 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-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java index 5c2b860..b424c94 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.enterprise.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.enterprise.domain.CarMessage; import com.muyu.enterprise.mapper.CarMessageMapper; @@ -7,6 +8,7 @@ import com.muyu.enterprise.service.CarMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** * 车辆报文--业务实现层 @@ -27,7 +29,8 @@ public class CarMessageServiceImpl extends ServiceImpl selectMessageShow(Long templateId) { - return sysCarMessageMapper.selectMessageShow(templateId); + return list(new LambdaQueryWrapper() + .eq(CarMessage::getTemplateId,templateId)); } /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java index 372321b..531aa55 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java @@ -18,8 +18,5 @@ import java.util.List; @Service public class CarMessageTypeServiceImpl extends ServiceImpl implements CarMessageTypeService { - @Override - public List messageTypeList() { - return null; - } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java index 4aea975..aa27d6e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java @@ -26,7 +26,7 @@ public class CarTemplateServiceImpl extends ServiceImpl selectTemplateShow() { - return sysCarTemplateMapper.selectTemplateShow(); + return list(); } /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/CarManageMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/CarManageMapper.xml index ec87e58..2626ceb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/CarManageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/car/CarManageMapper.xml @@ -4,75 +4,5 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/manage/CarMessageMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/manage/CarMessageMapper.xml index 28a4a2c..b0d850d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/manage/CarMessageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/manage/CarMessageMapper.xml @@ -4,17 +4,4 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/message/CarTemplateMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/message/CarTemplateMapper.xml index e4f5b4c..fa46ed1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/message/CarTemplateMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/message/CarTemplateMapper.xml @@ -4,10 +4,4 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - -