修复接口

whycxzp

2021-03-27 0dbb6f8c670b53ee0ae2a13c8217b2dcc28760ec

修复接口

 src/main/java/com/whyc/controller/DeviceMaintainController.java

@@ -8,8 +8,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("deviceMaintain")
@Api(tags = "设备维保")

 src/main/java/com/whyc/controller/DeviceManageController.java

@@ -29,11 +29,11 @@
        return service.getList();
    }

    @GetMapping("page")
    /*@GetMapping("page")
    @ApiOperation(value = "查询分页")
    public Response<PageInfo<DeviceManage>> getPage(@RequestParam int pageNum, @RequestParam int pageSize){
        return service.getPage(pageNum,pageSize);
    }
    }*/

    @PostMapping("pageByCondition")
    @ApiOperation(value = "查询分页-根据筛选条件")

 src/main/java/com/whyc/mapper/DeviceManageMapper.java

@@ -5,7 +5,7 @@
import java.util.List;

public interface DeviceManageMapper extends CustomMapper<DeviceManage>{
    List<DeviceManage> getAll();
    //List<DeviceManage> getAll();

    List<DeviceManage> getList();


 src/main/java/com/whyc/service/DeviceManageService.java

@@ -42,15 +42,15 @@
        return new Response().setMsg(1,"修改成功");
    }

    public Response<PageInfo<DeviceManage>> getPage(int pageNum,int pageSize) {
        /*QueryWrapper<DeviceManage> wrapper = Wrappers.query();
    /*public Response<PageInfo<DeviceManage>> getPage(int pageNum,int pageSize) {
        *//*QueryWrapper<DeviceManage> wrapper = Wrappers.query();
        wrapper.eq("status",1);
        IPage<DeviceManage> page1 = mapper.selectPage(new Page<>(pageNum,pageSize), wrapper);*/
        IPage<DeviceManage> page1 = mapper.selectPage(new Page<>(pageNum,pageSize), wrapper);*//*
        PageHelper.startPage(pageNum,pageSize,true);
        List<DeviceManage> deviceManageList = mapper.getAll();
        PageInfo<DeviceManage> deviceManagePageInfo = new PageInfo<>(deviceManageList);
        return new Response<PageInfo<DeviceManage>>().set(1,deviceManagePageInfo);
    }
    }*/

    public Response<List<DeviceManage>> getList() {
        List<DeviceManage> deviceManageList= mapper.getList();

 src/main/resources/mapper/DeviceManageMapper.xml

@@ -46,9 +46,12 @@
        <if test="deviceTypeId!=null and deviceTypeId!=0">
            and manage.device_type_id=#{deviceTypeId}
        </if>
        <if test="site!=null and user!=''">
        <if test="site!=null and site!=''">
            and manage.site=#{site}
        </if>
        <if test="status!=null and status!=''">
            and manage.status=#{status}
        </if>
        order by manage.create_time desc
    </select>
</mapper>