设备分页问题

gonglilong

2024-06-14 54b040d85ec19336d076956f1a416363e471d5ca

设备分页问题

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java

@@ -102,10 +102,10 @@
     * @param id
     * @return
     */
    @ApiOperation(value="巡查记录-通过id查询", notes="子设备-通过id查询")
    @ApiOperation(value="子设备-通过id查询", notes="子设备-通过id查询")
    @GetMapping(value = "/queryById")
    public R queryById(@RequestParam(name="id",required=true) String id) {
        SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
        SgDeviceDO sgDeviceDO = sgDeviceService.getSgDeviceById(id);
        return R.data(sgDeviceDO);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgDeviceMapper.java

@@ -3,6 +3,7 @@
import cn.gistack.sm.sg.DO.SgDeviceDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -17,5 +18,7 @@
 */
public interface SgDeviceMapper extends BaseMapper<SgDeviceDO> {

    List<SgDeviceDO> queryPageList(@Param("dto") SgDeviceSearchDTO dto);
    List<SgDeviceDO> queryPageList(@Param("page")IPage<SgDeviceDO> page,@Param("dto") SgDeviceSearchDTO dto);

    SgDeviceDO getSgDeviceById(@Param("id")String id);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgDeviceMapper.xml

@@ -15,4 +15,9 @@
            and ds.device_type = #{dto.deviceType}
        </if>
    </select>
    <select id="getSgDeviceById" resultType="cn.gistack.sm.sg.DO.SgDeviceDO">
        select ds.*,project.project_name as programName,dict."DICT_VALUE" as typeName from YWXT."SG_DEVICE" as ds left join YWXT."SG_PROJECT_INFO"  as project  on ds.program_id=project.id
        left join YWXT."BLADE_DICT_BIZ" as dict  on ds.device_type=dict.DICT_KEY  and dict.CODE='SG_DEVICE_TYPE' where  ds.id = #{id}

    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java

@@ -25,4 +25,6 @@
     * @return
     */
    List<SgDeviceDO> getDeviceList(String programId);

    SgDeviceDO getSgDeviceById(String id);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java

@@ -24,7 +24,7 @@

    @Override
    public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
        List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(searchDTO);
        List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(page,searchDTO);
        return page.setRecords(sgDeviceDOS);
    }

@@ -40,4 +40,9 @@
        queryWrapper.eq("program_id",programId);
        return baseMapper.selectList(queryWrapper);
    }

    @Override
    public SgDeviceDO getSgDeviceById(String id) {
        return baseMapper.getSgDeviceById(id);
    }
}