From 73a1d3eadf680d0a1a10872af4b20cd4f99e5fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Mon, 25 May 2020 23:04:41 +0800 Subject: [PATCH] =?UTF-8?q?Service=E5=B1=82=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/service/WebUpdateInfoService.java | 3 +- .../serviceimpl/WebUpdateInfoServiceImpl.java | 31 ++++++------------- .../java/cn/celess/blog/util/ModalTrans.java | 19 +++++++----- .../WebUpdateInfoControllerTest.java | 14 ++++----- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java index 6a0aa2f..c2fdec1 100644 --- a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java +++ b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java @@ -1,5 +1,6 @@ package cn.celess.blog.service; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.WebUpdateModel; import com.github.pagehelper.PageInfo; import net.sf.json.JSONObject; @@ -45,7 +46,7 @@ public interface WebUpdateInfoService { * @param page 数据页 * @return 分页数据 */ - PageInfo pages(int count, int page); + PageData pages(int count, int page); /** * 获取全部的更新记录 diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java index eee1da1..f23665a 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -2,12 +2,14 @@ package cn.celess.blog.service.serviceimpl; import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.WebUpdate; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.WebUpdateModel; import cn.celess.blog.exception.MyException; import cn.celess.blog.mapper.WebUpdateInfoMapper; import cn.celess.blog.service.WebUpdateInfoService; import cn.celess.blog.util.DateFormatUtil; import cn.celess.blog.util.HttpUtil; +import cn.celess.blog.util.ModalTrans; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -39,11 +41,11 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { if (info == null || info.replaceAll(" ", "").isEmpty()) { throw new MyException(ResponseEnum.PARAMETERS_ERROR); } - WebUpdate webUpdate = new WebUpdate(info, new Date()); + WebUpdate webUpdate = new WebUpdate(info); if (webUpdateInfoMapper.insert(webUpdate) == 0) { throw new MyException(ResponseEnum.FAILURE); } - return trans(webUpdate); + return ModalTrans.webUpdate(webUpdateInfoMapper.findById(webUpdate.getId())); } @Override @@ -65,26 +67,20 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { } webUpdate.setUpdateInfo(info); webUpdateInfoMapper.update(id, info); - return trans(webUpdate); + return ModalTrans.webUpdate(webUpdate); } @Override - public PageInfo pages(int count, int page) { + public PageData pages(int count, int page) { PageHelper.startPage(page, count); List updateList = webUpdateInfoMapper.findAll(); - PageInfo pageInfo = new PageInfo(updateList); - pageInfo.setList(list2List(updateList)); - return pageInfo; + return new PageData(new PageInfo(updateList), list2List(updateList)); } @Override public List findAll() { List all = webUpdateInfoMapper.findAll(); - List webUpdateModels = new ArrayList<>(); - for (WebUpdate w : all) { - webUpdateModels.add(trans(w)); - } - return webUpdateModels; + return list2List(all); } @Override @@ -101,7 +97,7 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { SimpleDateFormat sdf = new SimpleDateFormat(); Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date")); jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse))); - jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/"+object.getString("sha")); + jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + object.getString("sha")); } catch (IOException e) { log.info("网络请求失败{}", e.getMessage()); } @@ -110,14 +106,7 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { private List list2List(List webUpdates) { List webUpdateModels = new ArrayList<>(); - for (WebUpdate w : webUpdates) { - webUpdateModels.add(trans(w)); - } + webUpdates.forEach(update -> webUpdateModels.add(ModalTrans.webUpdate(update))); return webUpdateModels; } - - private WebUpdateModel trans(WebUpdate webUpdate) { - return new WebUpdateModel(webUpdate.getId(), webUpdate.getUpdateInfo(), DateFormatUtil.get(webUpdate.getUpdateTime())); - } - } diff --git a/src/main/java/cn/celess/blog/util/ModalTrans.java b/src/main/java/cn/celess/blog/util/ModalTrans.java index 306e12a..c77e15a 100644 --- a/src/main/java/cn/celess/blog/util/ModalTrans.java +++ b/src/main/java/cn/celess/blog/util/ModalTrans.java @@ -1,13 +1,7 @@ package cn.celess.blog.util; -import cn.celess.blog.entity.Article; -import cn.celess.blog.entity.Category; -import cn.celess.blog.entity.Tag; -import cn.celess.blog.entity.User; -import cn.celess.blog.entity.model.ArticleModel; -import cn.celess.blog.entity.model.CategoryModel; -import cn.celess.blog.entity.model.TagModel; -import cn.celess.blog.entity.model.UserModel; +import cn.celess.blog.entity.*; +import cn.celess.blog.entity.model.*; import org.springframework.beans.BeanUtils; /** @@ -61,4 +55,13 @@ public class ModalTrans { BeanUtils.copyProperties(tag, model); return model; } + + + public static WebUpdateModel webUpdate(WebUpdate update) { + WebUpdateModel model = new WebUpdateModel(); + model.setId(update.getId()); + model.setInfo(update.getUpdateInfo()); + model.setTime(DateFormatUtil.get(update.getUpdateTime())); + return model; + } } diff --git a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java index 2b7b09c..3bf2e18 100644 --- a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java @@ -2,9 +2,9 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.WebUpdate; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.WebUpdateModel; import cn.celess.blog.mapper.WebUpdateInfoMapper; -import com.github.pagehelper.PageInfo; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.junit.Test; @@ -104,17 +104,15 @@ public class WebUpdateInfoControllerTest extends BaseTest { JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertNotNull(object.getJSONObject(Result)); - PageInfo pageInfo = (PageInfo) JSONObject.toBean(object.getJSONObject(Result), PageInfo.class); - assertNotEquals(0, pageInfo.getEndRow()); - assertNotEquals(0, pageInfo.getStartRow()); - assertEquals(1, pageInfo.getPageNum()); - assertEquals(10, pageInfo.getPageSize()); - pageInfo.getList().forEach(o -> { + PageData pageData = (PageData) JSONObject.toBean(object.getJSONObject(Result), PageData.class); + assertEquals(1, pageData.getPageNum()); + assertEquals(10, pageData.getPageSize()); + for (Object o : pageData.getList()) { WebUpdateModel model = (WebUpdateModel) JSONObject.toBean(JSONObject.fromObject(o), WebUpdateModel.class); assertNotEquals(0, model.getId()); assertNotNull(model.getTime()); assertNotNull(model.getInfo()); - }); + } }); }