From 54571621c3d6975bdbd795252c0b15aa6417c7db Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期六, 08 十月 2022 14:52:05 +0800 Subject: [PATCH] 修改状态和处置完成 添加车辆管理 --- ycl-platform/src/main/java/com/ycl/mapper/carManage/CarSlagcarMapper.java | 16 ++ ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java | 68 +++++++++ ycl-platform/src/main/java/com/ycl/service/carManage/ICarEnforcecarService.java | 16 ++ ycl-platform/src/main/java/com/ycl/service/carManage/ICarSlagcarService.java | 16 ++ ycl-platform/src/main/resources/mapper/carManage/CarSlagcarMapper.xml | 21 +++ ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarEnforcecarServiceImpl.java | 20 ++ ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 97 +++++++++++++ ycl-platform/src/main/java/com/ycl/mapper/carManage/CarEnforcecarMapper.java | 16 ++ ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarSlagcarServiceImpl.java | 20 ++ ycl-platform/src/main/resources/mapper/carManage/CarEnforcecarMapper.xml | 21 +++ ycl-platform/src/main/java/com/ycl/entity/carManage/CarSlagcar.java | 70 ++++++++++ 11 files changed, 381 insertions(+), 0 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java new file mode 100644 index 0000000..e8d07f3 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java @@ -0,0 +1,97 @@ +package com.ycl.controller.carManage; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.api.CommonResult; +import com.ycl.controller.BaseController; +import com.ycl.entity.carManage.CarEnforcecar; +import com.ycl.entity.carManage.CarSlagcar; +import com.ycl.service.carManage.ICarEnforcecarService; +import com.ycl.service.carManage.ICarSlagcarService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * <p> + * 鎵ф硶杞﹀垪琛�(瀵规帴鎵ф硶杞PS) 鍓嶇鎺у埗鍣� + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +@RestController +@Api(tags = "杞﹁締绠$悊") +@RequestMapping("/car_Manage") +public class CarManageController extends BaseController { + + @Autowired + ICarEnforcecarService iCarEnforcecarService; + @Autowired + ICarSlagcarService iCarSlagcarService; + + @ApiOperation(value = "鏌ヨ鎵ф硶杞�") + @GetMapping("/query_enforce") + public CommonResult searchEnforceCar(@RequestParam String carNum, + @RequestParam Integer size, + @RequestParam Integer current) { + Page<CarEnforcecar> carEnforcecarPage = new Page<>(); + carEnforcecarPage.setSize(size); + carEnforcecarPage.setCurrent(current); + return CommonResult.success(iCarEnforcecarService + .page(carEnforcecarPage, new LambdaQueryWrapper<CarEnforcecar>() + .like(StringUtils.isNotBlank(carNum), CarEnforcecar::getCarNumber, carNum))); + } + + @ApiOperation(value = "鏌ヨ娓e湡杞�") + @GetMapping("/query_slag") + public CommonResult searchSlagCar(@RequestParam String carNum, + @RequestParam Integer size, + @RequestParam Integer current) { + Page<CarSlagcar> carSlagcarPage = new Page<>(); + carSlagcarPage.setSize(size); + carSlagcarPage.setCurrent(current); + return CommonResult.success(iCarSlagcarService + .page(carSlagcarPage, new LambdaQueryWrapper<CarSlagcar>() + .like(StringUtils.isNotBlank(carNum), CarSlagcar::getCarNumber, carNum))); + } + + @ApiOperation("淇敼鎵ф硶杞�") + @PutMapping("/modification_enforce") + public CommonResult modify(@RequestBody CarEnforcecar carEnforcecar) { + return CommonResult.success(iCarEnforcecarService.updateById(carEnforcecar)); + } + + @ApiOperation("淇敼娓e湡杞�") + @PutMapping("/modification_slag") + public CommonResult modify(@RequestBody CarSlagcar carSlagcar) { + return CommonResult.success(iCarSlagcarService.updateById(carSlagcar)); + } + + @ApiOperation("娣诲姞鎵ф硶杞�") + @PostMapping("/addition_enforce") + public CommonResult addEnforceCar(@RequestBody CarEnforcecar carEnforcecar) { + return CommonResult.success(iCarEnforcecarService.save(carEnforcecar)); + } + + @ApiOperation("娣诲姞娓e湡杞�") + @PostMapping("/addition_slag") + public CommonResult addSlagCar(@RequestBody CarSlagcar carSlagcar) { + return CommonResult.success(iCarSlagcarService.save(carSlagcar)); + } + + @ApiOperation("鍒犻櫎鎵ф硶杞�") + @DeleteMapping("/deletion_enforce") + public CommonResult deleteEnforceCar(@RequestParam Integer id) { + return CommonResult.success(iCarEnforcecarService.removeById(id)); + } + + @ApiOperation("鍒犻櫎娓e湡杞�") + @DeleteMapping("/deletion_enforce") + public CommonResult deleteSlagCar(@RequestParam Integer id) { + return CommonResult.success(iCarSlagcarService.removeById(id)); + } +} \ No newline at end of file diff --git a/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java new file mode 100644 index 0000000..20c47e3 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java @@ -0,0 +1,68 @@ +package com.ycl.entity.carManage; + +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 lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * <p> + * 鎵ф硶杞﹀垪琛�(瀵规帴鎵ф硶杞PS) + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_car_enforcecar") +public class CarEnforcecar implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 杞︾墝鍙� + */ + @TableField("car_number") + private String carNumber; + + /** + * 杞︿富濮撳悕 + */ + @TableField("owner_name") + private String ownerName; + + /** + * 杞﹁締浣跨敤浜哄憳 + */ + @TableField("vehicle_user") + private String vehicleUser; + + /** + * 鑱旂郴鏂瑰紡 + */ + @TableField("contact") + private String contact; + + /** + * 杞ㄨ抗鍒嗘瀽 + */ + @TableField("trajectory") + private String trajectory; + + /** + * 鎵�灞炲ぇ闃� + */ + @TableField("group") + private String group; +} diff --git a/ycl-platform/src/main/java/com/ycl/entity/carManage/CarSlagcar.java b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarSlagcar.java new file mode 100644 index 0000000..9993a50 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarSlagcar.java @@ -0,0 +1,70 @@ +package com.ycl.entity.carManage; + +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 lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * <p> + * 娓e湡杞﹀垪琛�(浣忔埧寤鸿灞�瀵规帴) + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_car_slagcar") +public class CarSlagcar implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 杞︾墝鍙� + */ + @TableField("car_number") + private String carNumber; + + /** + * 杞﹀瀷 + */ + @TableField("car_model") + private String carModel; + + /** + * 鍥剧墖 + */ + @TableField("car_photo") + private String carPhoto; + + /** + * 杞ㄨ抗鍒嗘瀽 + */ + @TableField("trajectory") + private String trajectory; + + /** + * 鏂藉伐鍦扮悊浣嶇疆淇℃伅 + */ + @TableField("geographic_position") + private String geographicPosition; + + /** + * 鏂藉伐鍗曚綅 + */ + @TableField("construction_org") + private String constructionOrg; + + +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarEnforcecarMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarEnforcecarMapper.java new file mode 100644 index 0000000..ff29e08 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarEnforcecarMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.carManage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.carManage.CarEnforcecar; + +/** + * <p> + * 鎵ф硶杞﹀垪琛�(瀵规帴鎵ф硶杞PS) Mapper 鎺ュ彛 + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +public interface CarEnforcecarMapper extends BaseMapper<CarEnforcecar> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarSlagcarMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarSlagcarMapper.java new file mode 100644 index 0000000..13392d8 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/carManage/CarSlagcarMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.carManage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.carManage.CarSlagcar; + +/** + * <p> + * 娓e湡杞﹀垪琛�(浣忔埧寤鸿灞�瀵规帴) Mapper 鎺ュ彛 + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +public interface CarSlagcarMapper extends BaseMapper<CarSlagcar> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/carManage/ICarEnforcecarService.java b/ycl-platform/src/main/java/com/ycl/service/carManage/ICarEnforcecarService.java new file mode 100644 index 0000000..32ce0e9 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/carManage/ICarEnforcecarService.java @@ -0,0 +1,16 @@ +package com.ycl.service.carManage; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.carManage.CarEnforcecar; + +/** + * <p> + * 鎵ф硶杞﹀垪琛�(瀵规帴鎵ф硶杞PS) 鏈嶅姟绫� + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +public interface ICarEnforcecarService extends IService<CarEnforcecar> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/carManage/ICarSlagcarService.java b/ycl-platform/src/main/java/com/ycl/service/carManage/ICarSlagcarService.java new file mode 100644 index 0000000..b20122f --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/carManage/ICarSlagcarService.java @@ -0,0 +1,16 @@ +package com.ycl.service.carManage; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.carManage.CarSlagcar; + +/** + * <p> + * 娓e湡杞﹀垪琛�(浣忔埧寤鸿灞�瀵规帴) 鏈嶅姟绫� + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +public interface ICarSlagcarService extends IService<CarSlagcar> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarEnforcecarServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarEnforcecarServiceImpl.java new file mode 100644 index 0000000..a560210 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarEnforcecarServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.carManage.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.carManage.CarEnforcecar; +import com.ycl.mapper.carManage.CarEnforcecarMapper; +import com.ycl.service.carManage.ICarEnforcecarService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鎵ф硶杞﹀垪琛�(瀵规帴鎵ф硶杞PS) 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +@Service +public class CarEnforcecarServiceImpl extends ServiceImpl<CarEnforcecarMapper, CarEnforcecar> implements ICarEnforcecarService { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarSlagcarServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarSlagcarServiceImpl.java new file mode 100644 index 0000000..b06ee45 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/carManage/impl/CarSlagcarServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.carManage.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.carManage.CarSlagcar; +import com.ycl.mapper.carManage.CarSlagcarMapper; +import com.ycl.service.carManage.ICarSlagcarService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 娓e湡杞﹀垪琛�(浣忔埧寤鸿灞�瀵规帴) 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author zhanghua + * @since 2022-10-08 + */ +@Service +public class CarSlagcarServiceImpl extends ServiceImpl<CarSlagcarMapper, CarSlagcar> implements ICarSlagcarService { + +} diff --git a/ycl-platform/src/main/resources/mapper/carManage/CarEnforcecarMapper.xml b/ycl-platform/src/main/resources/mapper/carManage/CarEnforcecarMapper.xml new file mode 100644 index 0000000..c61efce --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/carManage/CarEnforcecarMapper.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.carManage.CarEnforcecarMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.carManage.CarEnforcecar"> + <id column="id" property="id" /> + <result column="car_number" property="carNumber" /> + <result column="owner_name" property="ownerName" /> + <result column="vehicle_user" property="vehicleUser" /> + <result column="contact" property="contact" /> + <result column="trajectory" property="trajectory" /> + <result column="group" property="group" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id, car_number, owner_name, vehicle_user, contact, trajectory, group + </sql> + +</mapper> diff --git a/ycl-platform/src/main/resources/mapper/carManage/CarSlagcarMapper.xml b/ycl-platform/src/main/resources/mapper/carManage/CarSlagcarMapper.xml new file mode 100644 index 0000000..2154a84 --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/carManage/CarSlagcarMapper.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.carManage.CarSlagcarMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.carManage.CarSlagcar"> + <id column="id" property="id" /> + <result column="car_number" property="carNumber" /> + <result column="car_model" property="carModel" /> + <result column="car_photo" property="carPhoto" /> + <result column="trajectory" property="trajectory" /> + <result column="geographic_position" property="geographicPosition" /> + <result column="construction_org" property="constructionOrg" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id, car_number, car_model, car_photo, trajectory, geographic_position, construction_org + </sql> + +</mapper> -- Gitblit v1.8.0