From 7a20a6ca473162a5b0bf2a83027a2e0b411ad0b9 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 27 May 2024 16:31:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=BB=9F=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../car/controller/CarInfoController.java | 29 +++++++++++++------ .../car/entity/vo/CountCarModuleTypeVo.java | 14 +++++++++ .../car/entity/vo/TodayOutInNumber.java | 23 +++++++++++++-- .../modules/car/mapper/CarInfoMapper.java | 5 +++- .../car/mapper/CarPassRecordMapper.java | 6 ++-- .../modules/car/mapper/xml/CarInfoMapper.xml | 9 ++++++ .../car/mapper/xml/CarPassRecordMapper.xml | 21 ++++++++++---- .../modules/car/service/ICarInfoService.java | 3 ++ .../car/service/impl/CarInfoServiceImpl.java | 6 ++++ .../impl/CarPassRecordServiceImpl.java | 2 +- 10 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/car/entity/vo/CountCarModuleTypeVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 73f44cf6a..088c5cc60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -11,6 +11,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.car.entity.CarInfo; +import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo; import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.security.util.SecurityUtils; @@ -240,13 +241,23 @@ public class CarInfoController { return result; } - @ApiOperation(value = "统计项目下各车辆类型情况", notes = "统计项目下各车辆类型情况", httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/selectCarTypeCount") - public Result> selectCarTypeCount(@RequestBody Map map) { - return Result.success(carInfoService.selectCarTypeCount(map)); - } + @ApiOperation(value = "统计项目下各车辆黑白名单情况", notes = "统计项目下各车辆黑白名单情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/selectCarTypeCount") + public Result> selectCarTypeCount(@RequestBody Map map) { + return Result.success(carInfoService.selectCarTypeCount(map)); + } -} + @ApiOperation(value = "统计项目下各车辆类型情况", notes = "统计项目下各车辆类型情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countCarModuleType") + public Result countCarModuleType(@RequestBody Map map) { + return Result.success(carInfoService.countCarModuleType(map)); + } + + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/CountCarModuleTypeVo.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/CountCarModuleTypeVo.java new file mode 100644 index 000000000..05c2e984d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/CountCarModuleTypeVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.car.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountCarModuleTypeVo { + @ApiModelProperty("固定车数量") + private Integer gdcNum; + @ApiModelProperty("长期车数量") + private Integer cqcNum; + @ApiModelProperty("临时车数量") + private Integer lscNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java index bb321787b..c9e6c8d3c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java @@ -8,9 +8,28 @@ import lombok.Data; public class TodayOutInNumber { private String passTime; - @ApiModelProperty("出的数量") + @ApiModelProperty("出的数量（总出场次数）") private Integer outnum; - @ApiModelProperty("进的数量") + @ApiModelProperty("进的数量（总进场次数）") private Integer innum; + @ApiModelProperty("固定车进场车次") + private Integer gdcInNum; + @ApiModelProperty("长期车进场车次") + private Integer cqcInNum; + @ApiModelProperty("临时车进场车次") + private Integer lscInNum; + @ApiModelProperty("外来车辆进场车次") + private Integer wlcInNum; + + @ApiModelProperty("固定车出场车次") + private Integer gdcOutNum; + @ApiModelProperty("长期车出场车次") + private Integer cqcOutNum; + @ApiModelProperty("临时车出场车次") + private Integer lscOutNum; + @ApiModelProperty("外来车辆出场车次") + private Integer wlcOutNum; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java index ca5fdac9a..f43e3741e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java @@ -6,6 +6,7 @@ import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.car.entity.CarInfo; @@ -18,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper -@DataScope +@DataScope(includeTable = "car_info") public interface CarInfoMapper extends BaseMapper { @DataScope(includeTable = "car_info") @@ -27,4 +28,6 @@ public interface CarInfoMapper extends BaseMapper { List> selectCarTypeCount(Map map); String getCarTypeName(CarInfo carInfo); + + CountCarModuleTypeVo countCarModuleType(@Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java index e69066571..f70d26ab6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.car.mapper; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.car.entity.CarPassRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.data.redis.hash.HashMapper; /** * @Description: 车辆通行记录 @@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "enterprise_info") +@DataScope(includeTable = "car_info") public interface CarPassRecordMapper extends BaseMapper { Map getCurrentDayCarPassRecordOutAndInNum(Map map); @@ -41,7 +43,7 @@ public interface CarPassRecordMapper extends BaseMapper { String selectCarEnterTime(@Param("projectSn") String projectSn, @Param("carNumber") String carNumber); - TodayOutInNumber getTodayOutInNumber(@Param("projectSn") String projectSn, @Param("isOpen") Integer isOpen); + TodayOutInNumber getTodayOutInNumber(@Param("projectSn") String projectSn, @Param("isOpen") Integer isOpen, @Param("param") HashMap param); CarPassRecord queryNewestCarPassRecord(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml index d51b3c42c..69100e2eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml @@ -52,4 +52,13 @@ inner join car_type ct on ci.car_type = ct.id where ci.id=#{id} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml index d5de5b2ba..2c6cf1860 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml @@ -211,13 +211,22 @@ LIMIT 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java index bf706f828..a851abbf9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java @@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.car.entity.CarInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo; import java.util.Map; @@ -27,4 +28,6 @@ public interface ICarInfoService extends IService { Map selectCarTypeCount(Map map); void delete(Map map); + + CountCarModuleTypeVo countCarModuleType(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java index 4461152dd..1db05b072 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java @@ -14,6 +14,7 @@ import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.async.AsyncWorker; import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.car.entity.*; +import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo; import com.zhgd.xmgl.modules.car.mapper.*; import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; @@ -212,4 +213,9 @@ public class CarInfoServiceImpl extends ServiceImpl impl //同步海康 asyncHikvision.deleteCarInfoForHikvision(carInfo); } + + @Override + public CountCarModuleTypeVo countCarModuleType(Map map) { + return baseMapper.countCarModuleType(map); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java index f0a3de7aa..958571d8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java @@ -443,7 +443,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl()); } @Override