JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

Browse Source
This commit is contained in:
zhaoxiao
2023-03-06 09:16:52 +08:00
parent 7c1f81b8ec 0f59b80241
commit 1b5c779948
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java
+17 -17
View File
@@ -11,10 +11,7 @@ import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDataLog; import com.jero.modules.system.entity.SysDataLog;
import com.jero.modules.system.service.ISysDataLogService; import com.jero.modules.system.service.ISysDataLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,13 +25,14 @@ import lombok.extern.slf4j.Slf4j;
public class SysDataLogController { public class SysDataLogController {
@Autowired @Autowired
private ISysDataLogService service; private ISysDataLogService service;
@RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Result<IPage<SysDataLog>> queryPageList(SysDataLog dataLog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Result<IPage<SysDataLog>> queryPageList(SysDataLog dataLog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysDataLog>> result = new Result<IPage<SysDataLog>>(); Result<IPage<SysDataLog>> result = new Result<>();
QueryWrapper<SysDataLog> queryWrapper = QueryGenerator.initQueryWrapper(dataLog, req.getParameterMap()); QueryWrapper<SysDataLog> queryWrapper = QueryGenerator.initQueryWrapper(dataLog, req.getParameterMap());
Page<SysDataLog> page = new Page<SysDataLog>(pageNo, pageSize); Page<SysDataLog> page = new Page<>(pageNo, pageSize);
IPage<SysDataLog> pageList = service.page(page, queryWrapper); IPage<SysDataLog> pageList = service.page(page, queryWrapper);
log.info("查询当前页："+pageList.getCurrent()); log.info("查询当前页："+pageList.getCurrent());
log.info("查询当前页数量："+pageList.getSize()); log.info("查询当前页数量："+pageList.getSize());
@@ -44,22 +42,23 @@ public class SysDataLogController {
result.setResult(pageList); result.setResult(pageList);
return result; return result;
} }
/** /**
* 查询对比数据 * 查询对比数据
* @param req * @param req
* @return * @return
*/ */
@RequestMapping(value = "/queryCompareList", method = RequestMethod.GET) // @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET)
@GetMapping("/queryCompareList")
public Result<List<SysDataLog>> queryCompareList(HttpServletRequest req) { public Result<List<SysDataLog>> queryCompareList(HttpServletRequest req) {
Result<List<SysDataLog>> result = new Result<>(); Result<List<SysDataLog>> result = new Result<>();
String dataId1 = req.getParameter("dataId1"); String dataId1 = req.getParameter("dataId1");
String dataId2 = req.getParameter("dataId2"); String dataId2 = req.getParameter("dataId2");
List<String> idList = new ArrayList<String>(); List<String> idList = new ArrayList<>();
idList.add(dataId1); idList.add(dataId1);
idList.add(dataId2); idList.add(dataId2);
try { try {
List<SysDataLog> list = (List<SysDataLog>) service.listByIds(idList); List<SysDataLog> list = service.listByIds(idList);
result.setResult(list); result.setResult(list);
result.setSuccess(true); result.setSuccess(true);
} catch (Exception e) { } catch (Exception e) {
@@ -67,22 +66,23 @@ public class SysDataLogController {
} }
return result; return result;
} }
/** /**
* 查询版本信息 * 查询版本信息
* @param req * @param req
* @return * @return
*/ */
@RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET) // @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET)
@GetMapping("/queryDataVerList")
public Result<List<SysDataLog>> queryDataVerList(HttpServletRequest req) { public Result<List<SysDataLog>> queryDataVerList(HttpServletRequest req) {
Result<List<SysDataLog>> result = new Result<>(); Result<List<SysDataLog>> result = new Result<>();
String dataTable = req.getParameter("dataTable"); String dataTable = req.getParameter("dataTable");
String dataId = req.getParameter("dataId"); String dataId = req.getParameter("dataId");
QueryWrapper<SysDataLog> queryWrapper = new QueryWrapper<SysDataLog>(); QueryWrapper<SysDataLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("data_table", dataTable); queryWrapper.eq("data_table", dataTable);
queryWrapper.eq("data_id", dataId); queryWrapper.eq("data_id", dataId);
List<SysDataLog> list = service.list(queryWrapper); List<SysDataLog> list = service.list(queryWrapper);
if(list==null||list.size()<=0) { if(list==null||list.isEmpty()) {
return Result.error("未找到版本信息"); return Result.error("未找到版本信息");
}else { }else {
result.setResult(list); result.setResult(list);
@@ -90,5 +90,5 @@ public class SysDataLogController {
} }
return result; return result;
} }
} }