diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java index 5201f802..50f8a4b7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java @@ -11,10 +11,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDataLog; import com.jero.modules.system.service.ISysDataLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -28,13 +25,14 @@ import lombok.extern.slf4j.Slf4j; public class SysDataLogController { @Autowired private ISysDataLogService service; - - @RequestMapping(value = "/page", method = RequestMethod.GET) + +// @RequestMapping(value = "/page", method = RequestMethod.GET) + @GetMapping("/page") public Result> queryPageList(SysDataLog dataLog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { - Result> result = new Result>(); + Result> result = new Result<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dataLog, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = service.page(page, queryWrapper); log.info("查询当前页:"+pageList.getCurrent()); log.info("查询当前页数量:"+pageList.getSize()); @@ -44,22 +42,23 @@ public class SysDataLogController { result.setResult(pageList); return result; } - + /** * 查询对比数据 * @param req * @return */ - @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET) +// @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET) + @GetMapping("/queryCompareList") public Result> queryCompareList(HttpServletRequest req) { Result> result = new Result<>(); String dataId1 = req.getParameter("dataId1"); String dataId2 = req.getParameter("dataId2"); - List idList = new ArrayList(); + List idList = new ArrayList<>(); idList.add(dataId1); idList.add(dataId2); try { - List list = (List) service.listByIds(idList); + List list = service.listByIds(idList); result.setResult(list); result.setSuccess(true); } catch (Exception e) { @@ -67,22 +66,23 @@ public class SysDataLogController { } return result; } - + /** * 查询版本信息 * @param req * @return */ - @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET) +// @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET) + @GetMapping("/queryDataVerList") public Result> queryDataVerList(HttpServletRequest req) { Result> result = new Result<>(); String dataTable = req.getParameter("dataTable"); String dataId = req.getParameter("dataId"); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("data_table", dataTable); queryWrapper.eq("data_id", dataId); List list = service.list(queryWrapper); - if(list==null||list.size()<=0) { + if(list==null||list.isEmpty()) { return Result.error("未找到版本信息"); }else { result.setResult(list); @@ -90,5 +90,5 @@ public class SysDataLogController { } return result; } - + }