fix ： 新增日统计接口

kongdeqiang

2024-11-12 552c700f584700316e8d1919dd1ad7f551c53ec4

 src/main/java/com/boying/controller/WhiteListController.java

@@ -8,30 +8,31 @@
import com.boying.entity.WhiteList;
import com.boying.service.ParkService;
import com.boying.service.WhiteListService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;


@RestController
@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
@Tag(description = "ffzf/whiteList" , name = "白名单接口" )
public class WhiteListController{

    private final WhiteListService whiteListService;
    private final ParkService parkService;

    @PostMapping("/findPage")
    @Operation(summary = "分页查询" , description = "分页查询" )
    //@Operation(summary = "分页查询" , description = "分页查询" )
    public Object findPage(Page page, String carNo) {
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .orderByDesc(WhiteList::getId);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(record.getParkId() != null){
@@ -42,12 +43,19 @@
    }

    @PostMapping("/findPageNew")
    @Operation(summary = "分页查询（新）" , description = "分页查询（新）" )
    public Object findPageNew(Page page, String carNo) {
    public Object findPageNew(Page page, String carNo,Integer type,String date) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        if(StringUtils.isNotBlank(date)){
            System.out.println(date);
            Date parse = sdf.parse(date);
            date = sdf.format(parse);
        }
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .eq(type!=null,WhiteList::getType,type)
                .le(StringUtils.isNotBlank(date),WhiteList::getEndTime,date);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(StringUtils.isNotBlank(record.getParkIds())){
@@ -69,14 +77,12 @@
    }

    @PostMapping("/save")
    @Operation(summary = "新增白名单" , description = "新增白名单" )
    public Object save(WhiteList whiteList) {
        whiteListService.saveOrUpdate(whiteList);
        return R.ok("保存成功");
    }

    @PostMapping("/delete")
    @Operation(summary = "删除白名单" , description = "删除白名单" )
    public Object delete(Long id) {
        whiteListService.removeById(id);
        return R.ok("删除成功");