src/main/java/com/whyc/controller/MacController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MacService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/MacController.java
@@ -2,7 +2,6 @@ import com.whyc.dto.Response; import com.whyc.service.MacService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,8 +23,7 @@ @GetMapping("searMacHis") @ApiOperation(value = "查询mac历史记录") public Response searMacHis() { String uname = ActionUtil.getUser().getUName(); return service.searMacHis(uname); return service.searMacHis(); } @GetMapping("getMac") src/main/java/com/whyc/service/MacService.java
@@ -27,9 +27,8 @@ private MacMapper mapper; //查询mac历史记录 public Response searMacHis(String uname) { public Response searMacHis() { QueryWrapper wrapper = Wrappers.query(); wrapper.eq("uname", uname); wrapper.orderByDesc("record_time"); List<Mac> list = mapper.selectList(wrapper); return new Response().setII(1, list.size() > 0, list, "mac记录"); @@ -40,13 +39,13 @@ public void getMac(HttpServletRequest req, HttpServletResponse resp, int macNum) { //获取初始位置 QueryWrapper wrapper = Wrappers.query(); wrapper.orderByDesc("num"); wrapper.orderByDesc("record_time"); wrapper.last("limit 1"); Mac mac = mapper.selectOne(wrapper); String startStr = "00:00:00"; String stopStr = "00:00:00"; if (mac != null) { startStr = Integer.toHexString((mac.getStopNum() + 10001)); startStr = Integer.toHexString((mac.getStopNum() + 1)); } else { startStr = Integer.toHexString(10001); }