.

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sync/BaseSyncDataEndpoint.java

@@ -28,33 +28,33 @@ public class BaseSyncDataEndpoint  extends EnvelopRestEndpoint {
    private BaseSyncDataService baseSyncDataService;
    @GetMapping(value = BaseRequestMapping.SyncData.findAllSyncData)
    @ApiOperation(value = "获取同步数据列表")
    public PageEnvelop findAllSyncData( @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
                                            @RequestParam(value = "page") Integer page,
                                        @ApiParam(name = "size", value = "页码", required = true, defaultValue = "10")
                                            @RequestParam(value = "size") Integer size){
        try {
            return   baseSyncDataService.findAll(page,size);
        }catch (Exception e){
            return PageEnvelop.getError(e.getMessage(),-1);
        }
    }
//    @GetMapping(value = BaseRequestMapping.SyncData.findAllSyncData)
//    @ApiOperation(value = "获取同步数据列表")
//    public PageEnvelop findAllSyncData( @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
//                                            @RequestParam(value = "page") Integer page,
//                                        @ApiParam(name = "size", value = "页码", required = true, defaultValue = "10")
//                                            @RequestParam(value = "size") Integer size){
//        try {
//            return   baseSyncDataService.findAll(page,size);
//        }catch (Exception e){
//            return PageEnvelop.getError(e.getMessage(),-1);
//        }
//
//    }
    @GetMapping(value = BaseRequestMapping.SyncData.findDataByTime)
    @GetMapping(value = BaseRequestMapping.SyncData.findAllSyncData)
    @ApiOperation(value = "获取同步数据列表")
    public PageEnvelop findDataByTime( @ApiParam(name = "startTime", value = "开始时间", required = true, defaultValue = "")
                                        @RequestParam(value = "startTime") String startTime,
                                        @ApiParam(name = "endTime", value = "结束时间", required = true, defaultValue = "")
                                        @RequestParam(value = "endTime") String endTime,
    public PageEnvelop findAllSyncData( @ApiParam(name = "startTime", value = "开始时间", required = false, defaultValue = "")
                                        @RequestParam(value = "startTime",required = false) String startTime,
                                        @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
                                        @RequestParam(value = "endTime",required = false) String endTime,
                                       @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
                                           @RequestParam(value = "page") Integer page,
                                       @ApiParam(name = "size", value = "页码", required = true, defaultValue = "10")
                                           @RequestParam(value = "size") Integer size){
        try {
            return   baseSyncDataService.findDataByTime(startTime,endTime,page,size);
            return   baseSyncDataService.findAllSyncData(startTime,endTime,page,size);
        }catch (Exception e){
            return PageEnvelop.getError(e.getMessage(),-1);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/sync/BaseSyncDataService.java

@@ -32,17 +32,17 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
    @Autowired
    private UserAgent userAgent;
    public PageEnvelop findAll(Integer page, Integer size){
        StringBuffer sql= new StringBuffer("SELECT * FROM wlyy_data_sync ");
        sql.append(" ORDER BY complete_time LIMIT ").append((page-1)*size).append(",").append(size);
        List<BaseSyncDataDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(BaseSyncDataDO.class));
        long count =list.size();
        return PageEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find,list,page,size,count);
    }
//    public PageEnvelop findAll(Integer page, Integer size){
//
//        StringBuffer sql= new StringBuffer("SELECT * FROM wlyy_data_sync ");
//        sql.append(" ORDER BY complete_time LIMIT ").append((page-1)*size).append(",").append(size);
//
//        List<BaseSyncDataDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(BaseSyncDataDO.class));
//
//        long count =list.size();
//
//        return PageEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find,list,page,size,count);
//    }
    /**
     * 根据时间查询
@@ -50,7 +50,7 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
     * @param endTime
     * @return
     */
    public PageEnvelop findDataByTime(String startTime, String endTime,Integer page,Integer size) {
    public PageEnvelop findAllSyncData(String startTime, String endTime,Integer page,Integer size) {
        StringBuffer sql= new StringBuffer("SELECT c.* FROM wlyy_data_sync c WHERE 1=1 ");
        if (StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime)){