admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-03-16 14:44:26 +08:00
parent c4ab6d4e0b
commit ff4f5357e0
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
View File

@ -96,8 +96,9 @@ public class CarPassRecordController {
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "type", value = "1今日2历史", paramType = "body", required = true, dataType = "Integer"),
})
@PostMapping(value = "/list")
@PostMapping(value = {"/list", "/page"})
public Result<IPage<CarPassRecord>> queryPageList(@RequestBody Map<String, Object> map) {
return Result.success(carPassRecordService.selectProjectCarPassPageList(map));
}
@ -134,11 +135,12 @@ public class CarPassRecordController {
@ApiOperation(value = "今日出入车辆数", notes = "今日出入车辆数")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String")
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "isOpen", value = "是否放行 1放行 0不放行", paramType = "query", required = false, dataType = "Integer")
})
@GetMapping(value = "getTodayOutInNumber")
public Result<Map<String, Object>> getTodayOutInNumber(@ApiParam(value = "项目sn", required = true) String projectSn) {
return Result.success(carPassRecordService.getTodayOutInNumber(projectSn));
public Result<TodayOutInNumber> getTodayOutInNumber(@ApiParam(value = "项目sn", required = true) String projectSn, Integer isOpen) {
return Result.success(carPassRecordService.getTodayOutInNumber(projectSn, isOpen));
}
@ApiOperation(value = "根据车辆相机统计数据", notes = "根据车辆相机统计数据", httpMethod = "POST")

4
src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java
View File

@ -1,12 +1,16 @@
package com.zhgd.xmgl.modules.car.entity.vo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class TodayOutInNumber {
private String passTime;
@ApiModelProperty("出的数量")
private Integer outnum;
@ApiModelProperty("进的数量")
private Integer innum;
}

2
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java
View File

@ -39,7 +39,7 @@ public interface CarPassRecordMapper extends BaseMapper<CarPassRecord> {
String selectCarEnterTime(@Param("projectSn") String projectSn, @Param("carNumber") String carNumber);
EntityMap getTodayOutInNumber(String projectSn);
TodayOutInNumber getTodayOutInNumber(@Param("projectSn") String projectSn, @Param("isOpen") Integer isOpen);
CarPassRecord queryNewestCarPassRecord(Map<String, Object> map);

8
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
View File

@ -186,6 +186,9 @@
<if test="param.type != null">
and a.type = #{param.type}
</if>
<if test="param.type == '1'.toString()">
and a.pass_time >= current_date
</if>
order by a.pass_time desc
</select>
<select id="selectCarEnterTime" resultType="java.lang.String">
@ -197,12 +200,15 @@
order by pass_time desc
LIMIT 1
</select>
<select id="getTodayOutInNumber" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
<select id="getTodayOutInNumber" resultType="com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber">
SELECT IFNULL(SUM((CASE WHEN type = 1 THEN 1 ELSE 0 END)), 0) outnum,
IFNULL(SUM((CASE WHEN type = 0 THEN 1 ELSE 0 END)), 0) innum
FROM car_pass_record
WHERE project_sn = #{projectSn}
AND pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
<if test="isOpen != null and isOpen != ''">
and is_open = #{isOpen}
</if>
</select>
<select id="queryNewestCarPassRecord" resultType="com.zhgd.xmgl.modules.car.entity.CarPassRecord">

2
src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java
View File

@ -32,7 +32,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
IPage<CarPassRecord> selectProjectCarPassPageList(Map<String, Object> map);
EntityMap getTodayOutInNumber(String projectSn);
TodayOutInNumber getTodayOutInNumber(String projectSn, Integer isOpen);
CarPassRecord queryNewestCarPassRecord(Map<String, Object> map);
}

4
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java
View File

@ -424,8 +424,8 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
}
@Override
public EntityMap getTodayOutInNumber(String projectSn) {
return carPassRecordMapper.getTodayOutInNumber(projectSn);
public TodayOutInNumber getTodayOutInNumber(String projectSn, Integer isOpen) {
return carPassRecordMapper.getTodayOutInNumber(projectSn, isOpen);
}
@Override