From fc6b872cde3baee3ec01bab0eefecabf6b229a54 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 9 Sep 2019 13:02:20 +0800 Subject: [PATCH] bug --- .../epdc/controller/ApiNewsController.java | 2 +- .../esua/epdc/feign/NewsFeignClient.java | 2 +- .../esua/epdc/dto/NewsUserAttitudeDTO.java | 86 +++++++++++++++ .../esua/epdc/dto/enums/AppNewsLikeEnum.java | 31 ++++++ .../epdc/dto/epdc/form/EpdcNewsFromDTO.java | 2 +- .../controller/EpdcAppNewsController.java | 2 +- .../NewsUserAttitudeController.java | 94 ++++++++++++++++ .../esua/epdc/dao/NewsUserAttitudeDao.java | 33 ++++++ .../epdc/entity/NewsUserAttitudeEntity.java | 56 ++++++++++ .../epdc/excel/NewsUserAttitudeExcel.java | 65 +++++++++++ .../epdc/redis/NewsUserAttitudeRedis.java | 47 ++++++++ .../epdc/service/NewsUserAttitudeService.java | 95 ++++++++++++++++ .../epdc/service/impl/NewsServiceImpl.java | 51 ++++++--- .../impl/NewsUserAttitudeServiceImpl.java | 104 ++++++++++++++++++ .../src/main/resources/mapper/NewsDao.xml | 3 +- .../resources/mapper/NewsUserAttitudeDao.xml | 20 ++++ 16 files changed, 671 insertions(+), 22 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsUserAttitudeDTO.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/enums/AppNewsLikeEnum.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsUserAttitudeController.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsUserAttitudeDao.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsUserAttitudeEntity.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsUserAttitudeExcel.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NewsUserAttitudeRedis.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsUserAttitudeDao.xml diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 510fbc885..247aa567d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -94,7 +94,7 @@ public class ApiNewsController { * */ @GetMapping("news/detail/{newsId}") - public Result getNewsDetail(@PathVariable("id") String id){ + public Result getNewsDetail(@PathVariable("newsId") String id){ Result newsDetail = newsService.getNewsDetail(id); return newsDetail; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index 6d8722db8..8ea391dec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -81,7 +81,7 @@ public interface NewsFeignClient { * */ @GetMapping("news/epdc-app/news/detail/{newsId}") - Result getNewsDetail(@PathVariable("id") String id); + Result getNewsDetail(@PathVariable("newsId") String id); /*** * @Description 点赞和踩 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsUserAttitudeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsUserAttitudeDTO.java new file mode 100644 index 000000000..92b9d34dd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsUserAttitudeDTO.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Data +public class NewsUserAttitudeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 新闻ID + */ + private String epdcNewsId; + + /** + * 用户ID + */ + private String userId; + + /** + * 用户点赞点踩标识 0：点赞，1：踩 + */ + private String attitudeFlag; + + /** + * 删除标识 0：未删除，1：删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/enums/AppNewsLikeEnum.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/enums/AppNewsLikeEnum.java new file mode 100644 index 000000000..9c575baa2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/enums/AppNewsLikeEnum.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.enums; + +/** + * 用户审核状态枚举 + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/7 10:50 + */ +public enum AppNewsLikeEnum { + + /** + * 0-点赞 + */ + LIKE("0"), + /** + * 1-踩 + */ + UNLIKE("1"); + + private String value; + + AppNewsLikeEnum(String value) { + this.value = value; + } + + public String value() { + return value; + } + +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java index bf8b0e50a..b590f77b2 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java @@ -15,7 +15,7 @@ public class EpdcNewsFromDTO implements Serializable { * 用户所属网格ID */ @NotBlank(message = "用户网格ID不能为空") - private String deptId; + private Long deptId; /** * 页码 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java index eb3d563b5..365354872 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java @@ -80,7 +80,7 @@ public class EpdcAppNewsController { * */ @GetMapping("detail/{newsId}") - public Result getNewsDetail(@PathVariable("id") String id){ + public Result getNewsDetail(@PathVariable("newsId") String id){ Result newsDetail = newsService.getNewsDetail(id); return newsDetail; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsUserAttitudeController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsUserAttitudeController.java new file mode 100644 index 000000000..f1e20a383 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsUserAttitudeController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.excel.NewsUserAttitudeExcel; +import com.elink.esua.epdc.service.NewsUserAttitudeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@RestController +@RequestMapping("newsuserattitude") +public class NewsUserAttitudeController { + + @Autowired + private NewsUserAttitudeService newsUserAttitudeService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = newsUserAttitudeService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + NewsUserAttitudeDTO data = newsUserAttitudeService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody NewsUserAttitudeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + newsUserAttitudeService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody NewsUserAttitudeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + newsUserAttitudeService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + newsUserAttitudeService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = newsUserAttitudeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, NewsUserAttitudeExcel.class); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsUserAttitudeDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsUserAttitudeDao.java new file mode 100644 index 000000000..9f136fa02 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsUserAttitudeDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Mapper +public interface NewsUserAttitudeDao extends BaseDao { + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsUserAttitudeEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsUserAttitudeEntity.java new file mode 100644 index 000000000..c505ce369 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsUserAttitudeEntity.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_news_user_attitude") +public class NewsUserAttitudeEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 新闻ID + */ + private String epdcNewsId; + + /** + * 用户ID + */ + private String userId; + + /** + * 用户点赞点踩标识 0：点赞，1：踩 + */ + private String attitudeFlag; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsUserAttitudeExcel.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsUserAttitudeExcel.java new file mode 100644 index 000000000..b7e41aa22 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsUserAttitudeExcel.java @@ -0,0 +1,65 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Data +public class NewsUserAttitudeExcel { + + @Excel(name = "ID") + private String id; + + @Excel(name = "新闻ID") + private String epdcNewsId; + + @Excel(name = "用户ID") + private String userId; + + @Excel(name = "用户点赞点踩标识 0：点赞，1：踩") + private String attitudeFlag; + + @Excel(name = "删除标识 0：未删除，1：删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NewsUserAttitudeRedis.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NewsUserAttitudeRedis.java new file mode 100644 index 000000000..9907e5d2b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NewsUserAttitudeRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Component +public class NewsUserAttitudeRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java new file mode 100644 index 000000000..6a23fb571 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsUserAttitudeService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; + +import java.util.List; +import java.util.Map; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +public interface NewsUserAttitudeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author + * @date + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author + * @date + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return NewsUserAttitudeDTO + * @author + * @date + */ + NewsUserAttitudeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author + * @date + */ + void save(NewsUserAttitudeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author + * @date + */ + void update(NewsUserAttitudeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author + * @date + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index a38bd37be..6728551a7 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -30,9 +30,10 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dao.NewsDao; import com.elink.esua.epdc.dto.NewsDTO; +import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.dto.enums.AppNewsLikeEnum; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO; @@ -43,15 +44,14 @@ import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.NewsRedis; import com.elink.esua.epdc.service.NewsDepartmentService; import com.elink.esua.epdc.service.NewsService; +import com.elink.esua.epdc.service.NewsUserAttitudeService; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; @@ -75,6 +75,9 @@ public class NewsServiceImpl extends BaseServiceImpl implem @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private NewsUserAttitudeService newsUserAttitudeService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -134,6 +137,9 @@ public class NewsServiceImpl extends BaseServiceImpl implem entity.setCreatorName(user.getRealName()); entity.setDeptId(user.getDeptId()); entity.setDeptName(user.getDeptName()); + entity.setLikeNumber(0); + entity.setUnLikeNumber(0); + entity.setReadingAmount(0); //存草稿 entity.setNewsReleaseState("1"); insert(entity); @@ -192,9 +198,26 @@ public class NewsServiceImpl extends BaseServiceImpl implem entity.setCreatorName(user.getRealName()); entity.setDeptId(user.getDeptId()); entity.setDeptName(user.getDeptName()); - //不是草稿箱 - entity.setNewsReleaseState("0"); + entity.setLikeNumber(0); + entity.setUnLikeNumber(0); + entity.setReadingAmount(0); + //是不是草稿箱 + entity.setNewsReleaseState(newsReleaseState); + boolean isSave = true; + if (StringUtils.isNotBlank(newsDTO.getId())) { + isSave = false; + } + if (isSave) { + insert(entity); + } else { + updateById(entity); + newsDepartmentService.deleteByNewsId(entity.getId()); + } + //判断是否是草稿箱 是的话 不执行下面操作 + if(YesOrNoEnum.YES.value().equals(newsReleaseState)){ + return; + } // 通知所属部门id Long newsDeptId = entity.getStreetId(); // 能接收通知的所有网格的ID @@ -210,17 +233,7 @@ public class NewsServiceImpl extends BaseServiceImpl implem if (!user.getDeptIdList().contains(newsDeptId)) { throw new RenException("您没有操作此部门的数据权限"); } - boolean isSave = true; - if (StringUtils.isNotBlank(newsDTO.getId())) { - isSave = false; - } - if (isSave) { - insert(entity); - } else { - updateById(entity); - newsDepartmentService.deleteByNewsId(entity.getId()); - } if (CollUtil.isEmpty(newsGridList)) { Result> adminResult = adminFeignClient.listGridIdByDeptPid(newsDeptId); @@ -259,16 +272,22 @@ public class NewsServiceImpl extends BaseServiceImpl implem @Override public Result modifyStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) { NewsDTO newsDTO = get(newsStatementFromDTO.getNewsId()); + NewsUserAttitudeDTO newsUserAttitudeDTO=new NewsUserAttitudeDTO(); + //表态 0赞；1踩 NewsEntity newsEntity= ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class); if(YesOrNoEnum.YES.value().equals(newsStatementFromDTO.getAttitude())){ newsEntity.setUnLikeNumber(newsDTO.getUnLikeNumber()+1); + newsUserAttitudeDTO.setAttitudeFlag(AppNewsLikeEnum.LIKE.value()); }else { newsEntity.setLikeNumber(newsDTO.getLikeNumber()+1); + newsUserAttitudeDTO.setAttitudeFlag(AppNewsLikeEnum.UNLIKE.value()); } baseDao.insert(newsEntity); //插入新闻点赞点踩表 - + newsUserAttitudeDTO.setUserId(newsStatementFromDTO.getUserId()); + newsUserAttitudeDTO.setEpdcNewsId(newsStatementFromDTO.getNewsId()); + newsUserAttitudeService.save(newsUserAttitudeDTO); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java new file mode 100644 index 000000000..d027fada6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsUserAttitudeServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.NewsUserAttitudeDao; +import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; +import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; +import com.elink.esua.epdc.redis.NewsUserAttitudeRedis; +import com.elink.esua.epdc.service.NewsUserAttitudeService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 新闻点赞点踩表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-09-09 + */ +@Service +public class NewsUserAttitudeServiceImpl extends BaseServiceImpl implements NewsUserAttitudeService { + + @Autowired + private NewsUserAttitudeRedis newsUserAttitudeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, NewsUserAttitudeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, NewsUserAttitudeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public NewsUserAttitudeDTO get(String id) { + NewsUserAttitudeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, NewsUserAttitudeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(NewsUserAttitudeDTO dto) { + NewsUserAttitudeEntity entity = ConvertUtils.sourceToTarget(dto, NewsUserAttitudeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(NewsUserAttitudeDTO dto) { + NewsUserAttitudeEntity entity = ConvertUtils.sourceToTarget(dto, NewsUserAttitudeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index be59a0bbe..5d1eaf960 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml @@ -80,12 +80,11 @@ en.READING_AMOUNT AS readingAmount, en.UN_LIKE_NUMBER AS unlikeNumber, en.LIKE_NUMBER AS likeNumber, - nc.CATEGORY_NAME AS newsCategoryName + nc.CATEGORY_NAME AS categoryName FROM epdc_news en LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID WHERE en.ID = #{id} - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsUserAttitudeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsUserAttitudeDao.xml new file mode 100644 index 000000000..1793b5186 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsUserAttitudeDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file