更新接口

whycxzp

2021-03-30 cd947a54e3eba51fc2ef9b379fb293aa911fd34e

更新接口

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

@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

/**
 * 这里维保计划创建后,
@@ -34,6 +35,15 @@
        return service.getPageByCondition(pageNum, pageSize,maintainDTO);
    }

    @PostMapping("page2")
    @ApiOperation(value = "查询计划分页")
    @ApiIgnore
    public Response getPageByCondition2(@RequestParam Integer pageNum, @RequestParam Integer pageSize,
                                       @RequestBody DeviceMaintainDTO maintainDTO
    ) {
        return service.getPageByCondition2(pageNum, pageSize,maintainDTO);
    }

    @GetMapping
    @ApiOperation(value = "查询计划")
    public Response get(@RequestParam Integer deviceId) {

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

@@ -9,4 +9,6 @@
    List<DeviceMaintain> getPageByCondition(DeviceMaintainDTO maintainDTO);

    DeviceMaintain get(Integer deviceId);

    List<DeviceMaintain> getPageByCondition2(DeviceMaintainDTO maintainDTO);
}

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

@@ -59,4 +59,11 @@
        PageInfo<DeviceMaintain> deviceMaintainPageInfo = new PageInfo<>(deviceMaintainList);
        return new Response().set(1,deviceMaintainPageInfo);
    }

    public Response getPageByCondition2(Integer pageNum, Integer pageSize, DeviceMaintainDTO maintainDTO) {
        PageHelper.startPage(pageNum,pageSize);
        List<DeviceMaintain> deviceMaintainList = mapper.getPageByCondition2(maintainDTO);
        PageInfo<DeviceMaintain> deviceMaintainPageInfo = new PageInfo<>(deviceMaintainList);
        return new Response().set(1,deviceMaintainPageInfo);
    }
}

 src/main/resources/mapper/DeviceMaintainMapper.xml

@@ -61,8 +61,8 @@
            n.useful_life,
            n.debug_time,
            n.site,
            n.owner,
            m.owner as owner1,
            n.OWNER,
            m.OWNER AS owner1,
            m.owner2,
            m.phone,
            m.cycle,
@@ -70,12 +70,12 @@
            m.reminder_ahead_unit,
            m.reminder_type
        FROM
            db_experiment.tb_device_maintain m,
            db_experiment.tb_device_manage n ,
            db_experiment.tb_device_type t
            ( db_experiment.tb_device_manage n LEFT JOIN db_experiment.tb_device_maintain m ON m.device_id = n.device_id AND m.is_plan = 1 )
        LEFT JOIN db_experiment.tb_device_type t ON n.device_type_id = t.device_type_id
        WHERE
            m.device_id = n.device_id
            AND n.device_type_id = t.device_type_id
            AND m.is_plan=1
        n.device_id = #{deviceId}
    </select>
    <select id="getPageByCondition2" resultType="com.whyc.pojo.DeviceMaintain">

    </select>
</mapper>