diff --git a/pom.xml b/pom.xml index 3b995f9..0eef05b 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,11 @@ ${mqttv3.version} + + com.zhilian + zhilian-common-business + ${zhilian.version} + diff --git a/zhilian-common/pom.xml b/zhilian-common/pom.xml index 40dfb0d..c126378 100644 --- a/zhilian-common/pom.xml +++ b/zhilian-common/pom.xml @@ -19,6 +19,7 @@ zhilian-common-datasource zhilian-common-system zhilian-common-resolver + zhilian-common-business zhilian-common diff --git a/zhilian-common/zhilian-common-business/pom.xml b/zhilian-common/zhilian-common-business/pom.xml new file mode 100644 index 0000000..b6a2f04 --- /dev/null +++ b/zhilian-common/zhilian-common-business/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.zhilian + zhilian-common + 3.6.3 + + + zhilian-common-business + + + 17 + 17 + UTF-8 + + + + + + com.zhilian + zhilian-common-core + + + + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Markers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java similarity index 96% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Markers.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java index 800a917..b89c946 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Markers.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java @@ -28,7 +28,8 @@ public class Markers extends BaseEntity { @Excel(name = "标识名称") private String markersName; + @TableField(exist = false) - List fenceList; + List fenceIds; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Vehicle.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java similarity index 60% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Vehicle.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java index 942869a..f422402 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Vehicle.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java @@ -9,6 +9,8 @@ import com.zhilian.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; +import java.util.List; + /** * 车辆信息对象 business_vehicle */ @@ -31,50 +33,39 @@ public class Vehicle extends BaseEntity { /** * 车辆VIN */ - @Excel(name = "车辆VIN") - @TableField(value = "vehicle_vin") + @TableField("vehicle_vin") private String vehicleVIN; /** * 车辆类型编号 */ - @Excel(name = "车辆类型编号") - @TableField(value = "vehicle_type_id") private Long vehicleTypeId; - /** - * 电子围栏编号 - */ - @Excel(name = "电子围栏") - @TableField(value = "fence_id") - private Long fenceId; + + + @TableField(exist = false) + private Long vehicleTypeName; + /** * 电机厂商 */ - @Excel(name = "电机厂商") - @TableField(value = "vehicle_motor") - private String motorBusiness; + private String vehicleMotor; /** * 电池厂商 */ - @Excel(name = "电池厂商") - @TableField(value = "vehicle_battery") - private String batteryBusiness; + private String vehicleBattery; /** * 电机ID */ - @Excel(name = "电机ID") - @TableField(value = "motor_id") - private String motorID; + private String motorId; /** * 电池ID */ - @Excel(name = "电池ID") - @TableField(value = "battery_id") - private String batteryID; + private String batteryId; /** * 车辆状态 */ - @Excel(name = "车辆状态") - @TableField(value = "vehicle_state") private Long vehicleState; + + @TableField(exist = false) + private List markersIds; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/VehicleType.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/VehicleType.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java similarity index 87% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java index 914bc99..d4a732e 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java @@ -1,13 +1,9 @@ package com.zhilian.business.domain.middle; import com.baomidou.mybatisplus.annotation.*; -import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.Markers; import lombok.Data; import lombok.ToString; -import java.util.List; - @Data @ToString @TableName("business_markers_fence") diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java similarity index 100% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java new file mode 100644 index 0000000..9fd5a94 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java @@ -0,0 +1,7 @@ +package com.zhilian.business.remote; + +import org.springframework.stereotype.Component; + +@Component +public interface RemoteFenceService { +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java new file mode 100644 index 0000000..3ba9998 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java @@ -0,0 +1,8 @@ +package com.zhilian.business.remote.factory; + +import com.zhilian.common.core.constant.ServiceNameConstants; +import org.springframework.cloud.openfeign.FeignClient; + +//@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) +public class RemoteFenceFallbackFactory { +} diff --git a/zhilian-modules/zhilian-business/pom.xml b/zhilian-modules/zhilian-business/pom.xml index 6e869f8..413480b 100644 --- a/zhilian-modules/zhilian-business/pom.xml +++ b/zhilian-modules/zhilian-business/pom.xml @@ -73,6 +73,12 @@ zhilian-common-log + + + com.zhilian + zhilian-common-business + + com.zhilian @@ -106,4 +112,4 @@ - \ No newline at end of file + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java index 9c66432..1aedb8d 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java @@ -3,7 +3,6 @@ package com.zhilian.business.controller; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.vo.FenceVo; import com.zhilian.business.service.FenceService; import com.zhilian.common.core.web.page.TableDataInfo; import com.zhilian.common.security.utils.SecurityUtils; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java index 813e213..9221418 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java @@ -3,7 +3,6 @@ package com.zhilian.business.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhilian.business.domain.Markers; import com.zhilian.business.domain.middle.MarkersFence; -import com.zhilian.business.domain.middle.VehicleMarkers; import com.zhilian.business.service.MarkersFenceService; import com.zhilian.business.service.MarkersService; import com.zhilian.common.core.domain.Result; @@ -34,6 +33,12 @@ public class MarkersController extends BaseController { return getDataTable(result); } + @GetMapping("markersVehicle") + public Result> markersVehicle() { + List listMarkers = markersService.listMarkers(); + return Result.success(listMarkers); + } + @PostMapping("insert") public Result insert(@RequestBody Markers markers){ return toAjax(markersService.save(markers)); @@ -44,8 +49,8 @@ public class MarkersController extends BaseController { return toAjax(markersService.updateById(markers)); } - @PostMapping("delete") - public Result delete(@RequestParam Long markersId) { + @PostMapping("delete/{markersId}") + public Result delete(@PathVariable Long markersId) { markersFenceList(markersId).forEach(markersFence -> { markersFenceService.removeById(markersId); }); @@ -57,7 +62,8 @@ public class MarkersController extends BaseController { return toAjax(markersFenceService.save(markersFence)); } - public List markersFenceList(Long markersId){ + @PostMapping("markersFenceList/{markersId}") + public List markersFenceList(@PathVariable Long markersId){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MarkersFence::getMarkerId, markersId); return markersFenceService.list(queryWrapper); diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java index 7a23c6b..d6a153b 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java @@ -1,12 +1,13 @@ package com.zhilian.business.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhilian.business.domain.Markers; import com.zhilian.business.domain.Vehicle; import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.business.service.MarkersService; import com.zhilian.business.service.VehicleMarkersService; import com.zhilian.business.service.VehicleService; import com.zhilian.common.core.domain.Result; -import com.zhilian.common.core.utils.StringUtils; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.common.core.web.page.TableDataInfo; import com.zhilian.common.security.utils.SecurityUtils; @@ -25,12 +26,17 @@ public class VehicleController extends BaseController { @Autowired private VehicleMarkersService vehicleMarkersService; + + @Autowired + private MarkersService markersService; + + /** * 查询车辆列表 * @param vehicle * @return */ - @GetMapping("/list") + @PostMapping("/list") public Result> list(@RequestBody Vehicle vehicle) { startPage(); List list = vehicleService.selectVehicleList(vehicle); @@ -58,7 +64,16 @@ public class VehicleController extends BaseController { public Result vehicleUpdate(@RequestBody Vehicle vehicle){ vehicle.setUpdateBy(SecurityUtils.getUsername()); vehicle.setUpdateTime(new Date()); - return toAjax(vehicleService.updateById(vehicle)); + + //删除中间表全部关联数据 + vehicleMarkersService.removeAllVehicle(vehicle); + + //修改原表数据 + boolean update =vehicleService.updateById(vehicle); + + //重新添加中间表数据 + vehicleMarkersService.insert(vehicle); + return toAjax(update); } /** @@ -66,20 +81,30 @@ public class VehicleController extends BaseController { * @param vehicleId * @return */ - public List getVehicleMarkers(Long vehicleId){ + @PostMapping("/getVehicleMarkers/{vehicleId}") + public List getVehicleMarkers(@PathVariable Long vehicleId){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); return vehicleMarkersService.list(queryWrapper); } - +// @PostMapping("/getMarkers/{vehicleId}") +// public List getMarkers(@PathVariable Long vehicleId){ +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); +// List list = vehicleMarkersService.list(queryWrapper); +// list.forEach(vehicleMarkers -> { +// Markers markers = markersService.getById(vehicleMarkers.getMarkersId()); +// }); +// return null; +// } /** * 删除车辆 * @param vehicleId * @return */ - @PostMapping("/vehicleDelete") - public Result vehicleDelete(@RequestParam Long vehicleId){ + @PostMapping("/vehicleDelete/{vehicleId}") + public Result vehicleDelete(@PathVariable Long vehicleId){ getVehicleMarkers(vehicleId).forEach(vehicleMarkers -> { vehicleMarkersService.removeById(vehicleId); }); @@ -88,11 +113,12 @@ public class VehicleController extends BaseController { /** * 车辆绑定围栏 - * @param vehicleMarkers + * @param vehicle * @return */ @PostMapping("/vehicleInsertMarkers") - public Result vehicleInsertMarkers(@RequestBody VehicleMarkers vehicleMarkers){ - return toAjax(vehicleMarkersService.save(vehicleMarkers)); + public Result vehicleInsertMarkers(@RequestBody Vehicle vehicle){ + boolean insert = vehicleMarkersService.insert(vehicle); + return toAjax(insert); } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java index 1e885cd..56837a7 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java @@ -1,7 +1,5 @@ package com.zhilian.business.controller; -import com.zhilian.business.domain.Markers; -import com.zhilian.business.domain.middle.MarkersFence; import com.zhilian.business.domain.middle.VehicleMarkers; import com.zhilian.business.service.VehicleMarkersService; import com.zhilian.common.core.domain.Result; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java index 59c6a8b..0af642c 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java @@ -1,12 +1,8 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.Markers; import com.zhilian.business.domain.middle.MarkersFence; -import java.util.List; - public interface MarkersFenceService extends IService { // List selectFenceByIdAndMarkersBuyId(List list, List list1, List list2,MarkersFence markersFence); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java index 25d0198..832269e 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java @@ -2,13 +2,12 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhilian.business.domain.Markers; -import com.zhilian.business.domain.middle.MarkersFence; -import com.zhilian.common.core.domain.Result; -import com.zhilian.common.core.web.page.TableDataInfo; import java.util.List; public interface MarkersService extends IService { List selectMarkersList(Markers markers); + List listMarkers(); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java index c0346d5..a18835c 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java @@ -1,10 +1,14 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Vehicle; import com.zhilian.business.domain.middle.VehicleMarkers; import org.springframework.stereotype.Service; @Service public interface VehicleMarkersService extends IService { + boolean insert(Vehicle vehicle); + + void removeAllVehicle(Vehicle vehicle); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java index 0c5042d..1e3f369 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java @@ -2,17 +2,10 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.Vehicle; -import com.zhilian.business.domain.vo.FenceVo; import com.zhilian.business.mapper.FenceMapper; -import com.zhilian.business.mapper.MarkersFenceMapper; -import com.zhilian.business.mapper.MarkersMapper; import com.zhilian.business.service.FenceService; import com.zhilian.common.core.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java index 823ce1c..ad47575 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java @@ -1,18 +1,12 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.Markers; import com.zhilian.business.domain.middle.MarkersFence; import com.zhilian.business.mapper.MarkersFenceMapper; import com.zhilian.business.service.MarkersFenceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - @Service public class MarkersFenceServiceImpl extends ServiceImpl implements MarkersFenceService { @Autowired diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java index ffdb0f2..27855e6 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java @@ -3,17 +3,19 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhilian.business.domain.Markers; -import com.zhilian.business.domain.Vehicle; import com.zhilian.business.mapper.MarkersMapper; import com.zhilian.business.service.MarkersService; import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service public class MarkersServiceImpl extends ServiceImpl implements MarkersService { - + @Autowired + RedisService service; @Override public List selectMarkersList(Markers markers) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -22,4 +24,20 @@ public class MarkersServiceImpl extends ServiceImpl impl return this.list(queryWrapper); } + + + /** + * 查询全部标识信息 + * @return + */ + @Override + public List listMarkers() { + if(service.hasKey("markers")){ + List markers = service.getCacheList("markers"); + return markers; + } + List list = this.list(); + service.setCacheList("markers",list); + return list; + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java index a0e7cec..2bda78e 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java @@ -1,11 +1,36 @@ package com.zhilian.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.Vehicle; import com.zhilian.business.domain.middle.VehicleMarkers; import com.zhilian.business.mapper.VehicleMarkersMapper; import com.zhilian.business.service.VehicleMarkersService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; @Service public class VehicleMarkersServiceImpl extends ServiceImpl implements VehicleMarkersService { + + @Transactional(rollbackFor=Exception.class) + @Override + public boolean insert(Vehicle vehicle) { + vehicle.getMarkersIds().forEach(markerId -> { + VehicleMarkers vehicleMarkers = new VehicleMarkers(); + vehicleMarkers.setVehicleId(vehicle.getVehicleId()); + vehicleMarkers.setMarkersId(markerId); + this.save(vehicleMarkers); + }); + return true; + } + + @Override + public void removeAllVehicle(Vehicle vehicle) { + List list = this.list(new LambdaQueryWrapper().eq(VehicleMarkers::getVehicleId, vehicle.getVehicleId())); + list.forEach(item -> { + this.removeById(item.getVehicleId()); + }); + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java index 4dbed61..dc50464 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java @@ -3,41 +3,61 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhilian.business.domain.Vehicle; +import com.zhilian.business.domain.middle.VehicleMarkers; import com.zhilian.business.mapper.VehicleMapper; +import com.zhilian.business.mapper.VehicleMarkersMapper; import com.zhilian.business.service.VehicleService; import com.zhilian.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; -import java.util.Objects; @Service public class VehicleServiceImpl extends ServiceImpl implements VehicleService { + @Override public List selectVehicleList(Vehicle vehicle) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - //模糊条件 查询车辆VIN - queryWrapper.like(StringUtils.isNotEmpty(vehicle.getVehicleVIN()), Vehicle::getVehicleVIN, vehicle.getVehicleVIN()); - - //精确查询 查询车辆类型 - queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(vehicle.getVehicleTypeId())), Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()); - + //模糊条件 查询VIN + if (StringUtils.isNotEmpty(vehicle.getVehicleVIN())) { + queryWrapper.like(Vehicle::getVehicleVIN, vehicle.getVehicleVIN()); + } + // 精确查询 - 查询类型 + if (vehicle.getVehicleTypeId() != null) { + queryWrapper.eq(Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()); + } //模糊查询 车辆电机厂商 - queryWrapper.like(StringUtils.isNotEmpty(vehicle.getMotorID()), Vehicle::getMotorID, vehicle.getMotorID()); - + if (StringUtils.isNotEmpty(vehicle.getMotorId())) { + queryWrapper.like(Vehicle::getMotorId, vehicle.getMotorId()); + } //模糊查询 车辆电池厂商 - queryWrapper.like(StringUtils.isNotEmpty(vehicle.getBatteryID()), Vehicle::getBatteryID, vehicle.getBatteryID()); - + if (StringUtils.isNotEmpty(vehicle.getBatteryId())) { + queryWrapper.like(Vehicle::getBatteryId, vehicle.getBatteryId()); + } //模糊查询 车辆电机ID - queryWrapper.like(StringUtils.isNotEmpty(vehicle.getMotorBusiness()),Vehicle::getMotorBusiness, vehicle.getMotorBusiness()); - + if (StringUtils.isNotEmpty(vehicle.getVehicleMotor())) { + queryWrapper.like(Vehicle::getVehicleMotor, vehicle.getVehicleMotor()); + } //模糊查询 车辆电池ID - queryWrapper.like(StringUtils.isNotEmpty(vehicle.getBatteryBusiness()),Vehicle::getBatteryBusiness,vehicle.getBatteryBusiness()); - + if (StringUtils.isNotEmpty(vehicle.getVehicleBattery())) { + queryWrapper.like(Vehicle::getVehicleBattery, vehicle.getVehicleBattery()); + } + //精确查询 车辆状态 + if (vehicle.getVehicleState() != null) { + queryWrapper.eq(Vehicle::getVehicleState, vehicle.getVehicleState()); + } +// queryWrapper.like(StringUtils.isNotEmpty(vehicle.getVehicleVIN()), Vehicle::getVehicleVIN, vehicle.getVehicleVIN()) +// .eq(vehicle.getVehicleTypeId() != null, Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorID()), Vehicle::getMotorID, vehicle.getMotorID()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryID()), Vehicle::getBatteryID, vehicle.getBatteryID()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorBusiness()), Vehicle::getMotorBusiness, vehicle.getMotorBusiness()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryBusiness()), Vehicle::getBatteryBusiness, vehicle.getBatteryBusiness()) +// .eq(vehicle.getVehicleState() != null, Vehicle::getVehicleState, vehicle.getVehicleState()); return this.list(queryWrapper); } + } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml index 7ae037c..6acc1c7 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml @@ -3,57 +3,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml index 211368c..3addf96 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml @@ -4,6 +4,4 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - -