From 646affd788f282a083c145067d236f3742f63d2a Mon Sep 17 00:00:00 2001 From: qk <1005180704@qq。com> Date: Thu, 26 May 2022 08:55:59 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/advice/AdcDaBaseExceptionAdvice.java | 2 +- .../java/com/adc/da/common/NewsFeedEnum.java | 30 +++++++++ .../controller/NewsFeedController.java | 56 +++++++++++++++++ .../adc/da/slrs/NewsFeed/dao/NewsFeedDao.java | 14 +++++ .../adc/da/slrs/NewsFeed/entity/NewsFeed.java | 63 +++++++++++++++++++ .../da/slrs/NewsFeed/page/NewsFeedPage.java | 30 +++++++++ .../NewsFeed/service/INewsFeedService.java | 15 +++++ .../service/Impl/NewsFeedServiceImpl.java | 38 +++++++++++ 8 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/common/NewsFeedEnum.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/dao/NewsFeedDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/entity/NewsFeed.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/page/NewsFeedPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/INewsFeedService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/Impl/NewsFeedServiceImpl.java diff --git a/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java index d67d92c7..44ae7eae 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java +++ b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java @@ -34,7 +34,7 @@ public class AdcDaBaseExceptionAdvice { log.error(exception.getMessage(), exception); // TODO 在数据库中记录程序异常，这个地方的异常是未处理的异常，需要管理员查看并进行处理以防重复出现 if(exception.getStackTrace() != null){ - if(exception.getMessage().equals("token已过期")){ + if("token已过期".equals(exception.getMessage())){ return Result.error(ResponseMessageCodeEnum.ERROR_TOKEN.getCode(), "token已过期，请重新登录"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/NewsFeedEnum.java b/adc-da-slrs/src/main/java/com/adc/da/common/NewsFeedEnum.java new file mode 100644 index 00000000..fbb633ed --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/common/NewsFeedEnum.java @@ -0,0 +1,30 @@ +package com.adc.da.common; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 14:28 + * @Version 1.0 + */ +public enum NewsFeedEnum { + GNWBZFG("GNWBZFG","国内外标准法规入库"), + ZYBZFG("ZYBZFG","在研标准法规入库"), + QYBZFB("QYBZFB","企业标准发布"); + + + + + private String value; + private String lable; + + private NewsFeedEnum(String value, String lable) { + this.value = value; + this.lable = lable; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java new file mode 100644 index 00000000..f881d013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.NewsFeed.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.NewsFeed.entity.NewsFeed; +import com.adc.da.slrs.NewsFeed.page.NewsFeedPage; +import com.adc.da.slrs.NewsFeed.service.Impl.NewsFeedServiceImpl; +import com.adc.da.slrs.msgDynamicInfo.entity.MsgDynamicInfoEO; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 14:59 + * @Version 1.0 + */ +@RestController +@RequestMapping("/${restPath}/lawss/NewsFeed") +@Api(description = "|NewsFeed|") +public class NewsFeedController extends BaseController { + + @Autowired + private NewsFeedServiceImpl newsFeedService; + + @GetMapping("/getNewsFeed") + public ResponseMessage> NewFeedPage(NewsFeedPage page){ + IPage iPage = new Page<>(); + iPage.setSize(page.getPageSize()); + iPage.setTotal(page.getPage()); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardId()),"STANDARD_ID",page.getStandardId()); + queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardName()),"STANDARD_NAME",page.getStandardName()); + queryWrapper.eq("MESSAGE_TYPE",page.getMessageType()); + queryWrapper.orderByDesc("UPDATE_TIME"); + IPage newsFeedList = newsFeedService.page(iPage,queryWrapper); + return Result.success(newsFeedList); + } + + @PostMapping("/insertNewsFeed") + public void insertNewsFeed(@RequestBody NewsFeed newsFeed){ + newsFeedService.insertNewsFeed(newsFeed); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/dao/NewsFeedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/dao/NewsFeedDao.java new file mode 100644 index 00000000..f83f18d4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/dao/NewsFeedDao.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.NewsFeed.dao; + +import com.adc.da.slrs.NewsFeed.entity.NewsFeed; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 14:59 + * @Version 1.0 + */ +@Repository +public interface NewsFeedDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/entity/NewsFeed.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/entity/NewsFeed.java new file mode 100644 index 00000000..41837032 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/entity/NewsFeed.java @@ -0,0 +1,63 @@ +package com.adc.da.slrs.NewsFeed.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 14:47 + * @Version 1.0 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="NewsFeed对象", description="") +public class NewsFeed extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @TableField("RESOURCE_TYPE") + @ApiModelProperty(value = "资源类型") + private String resourceType; + + @TableField("MESSAGE_TYPE") + @ApiModelProperty(value = "消息类型") + private String messageType; + + @TableField("STANDARD_ID") + @ApiModelProperty(value = "标准ID") + private String standardId; + + @TableField("STANDARD") + @ApiModelProperty(value = "标准号") + private String standard; + + @TableField("STANDARD_NAME") + @ApiModelProperty(value = "标准名称") + private String standardName; + + @TableField("RELEASE_DATE") + @ApiModelProperty(value = "发布日期") + private String releaseDate; + + @TableField("TEXT_STATE") + @ApiModelProperty(value = "文本状态") + private String textState; + + @TableField("RENEW_TIME") + @ApiModelProperty(value = "更新时间") + private Date renewTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/page/NewsFeedPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/page/NewsFeedPage.java new file mode 100644 index 00000000..05c5bb49 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/page/NewsFeedPage.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.NewsFeed.page; + +import com.adc.da.sys.common.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 15:36 + * @Version 1.0 + */ +@Data +public class NewsFeedPage { + + private String id; + private String resourceType; + private String messageType; + private String standardId; + private String standard; + private String standardName; + private String releaseDate; + private String textState; + private Date renewTime; + private Long page; + private Long pageSize; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/INewsFeedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/INewsFeedService.java new file mode 100644 index 00000000..fd4b7b97 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/INewsFeedService.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.NewsFeed.service; + +import com.adc.da.slrs.NewsFeed.entity.NewsFeed; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.stereotype.Service; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 15:01 + * @Version 1.0 + */ +@Service +public interface INewsFeedService extends IService { + int insertNewsFeed(NewsFeed newsFeed); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/Impl/NewsFeedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/Impl/NewsFeedServiceImpl.java new file mode 100644 index 00000000..d3a28b72 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/service/Impl/NewsFeedServiceImpl.java @@ -0,0 +1,38 @@ +package com.adc.da.slrs.NewsFeed.service.Impl; + +import com.adc.da.common.NewsFeedEnum; +import com.adc.da.slrs.NewsFeed.dao.NewsFeedDao; +import com.adc.da.slrs.NewsFeed.entity.NewsFeed; +import com.adc.da.slrs.NewsFeed.service.INewsFeedService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Author: qk + * @Date: 2022/5/23 0023 15:02 + * @Version 1.0 + */ +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class NewsFeedServiceImpl extends ServiceImpl implements INewsFeedService { + + + @Override + public int insertNewsFeed(NewsFeed newsFeed) { + switch (newsFeed.getMessageType()){ + case "0": + newsFeed.setMessageType( NewsFeedEnum.GNWBZFG.getValue()); + break; + case "1": + newsFeed.setMessageType( NewsFeedEnum.ZYBZFG.getValue()); + break; + case "2": + newsFeed.setMessageType( NewsFeedEnum.QYBZFB.getValue()); + break; + } + this.save(newsFeed); + return 1; + } +}