From 31c76061c6b7667de5437a6159c53ef59f356cac Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 9 Dec 2020 09:31:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E9=81=93=E6=8D=8E=20=E6=8B=BC?= =?UTF-8?q?=E5=9B=A2=E8=B4=ADPC=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/producer/PointsProducer.java | 1 + .../epdc/service/impl/CustomServiceImpl.java | 4 ++ .../epdc-custom/epdc-custom-client/pom.xml | 5 ++ .../epdc/constant/SdsPtgNoticeConstant.java | 36 +++++++++++++ .../epdc/dto/form/SdsPtgShieldFormDTO.java | 31 +++++++++++ .../com/elink/esua/epdc/async/NewsTask.java | 33 ++++++++++++ .../epdc/modules/feign/NewsFeignClient.java | 32 ++++++++++++ .../fallback/NewsFeignClientFallback.java | 21 ++++++++ .../controller/GroupBuyInfoController.java | 15 ++++++ .../groupbuy/service/GroupBuyInfoService.java | 9 ++++ .../service/impl/GroupBuyInfoServiceImpl.java | 49 ++++++++++++++++++ .../sds/controller/SdsInfoController.java | 15 +++++- .../modules/sds/service/SdsInfoService.java | 9 ++++ .../sds/service/impl/SdsInfoServiceImpl.java | 51 +++++++++++++++++++ .../main/resources/mapper/sds/SdsInfoDao.xml | 3 +- 15 files changed, 312 insertions(+), 2 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java diff --git a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java index 62627e5c..8798ee5d 100644 --- a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java +++ b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/rocketmq/producer/PointsProducer.java @@ -35,6 +35,7 @@ public class PointsProducer { log.info("积分埋点发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId()); } catch (Exception e) { log.error("积分埋点发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body); + log.error(e.getMessage()); e.printStackTrace(); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index 99e1fedf..da393035 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java @@ -230,6 +230,10 @@ public class CustomServiceImpl implements CustomService { @Override public Result> getSdsList(TokenDto tokenDto,EpdcSelectSdsInfoListFormDTO formDTO) { + if(StringUtils.isBlank(tokenDto.getUserId())){ + return new Result>().error("无效的token"); + } + formDTO.setUserId(tokenDto.getUserId()); return customFeignClient.getSdsList(formDTO); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml index b1a1ac33..cea8e19d 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml @@ -18,6 +18,11 @@ epdc-commons-tools 1.0.0 + + com.esua.epdc + epdc-news-client + 1.0.0 + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java new file mode 100644 index 00000000..fd054853 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.constant; + +/** + * 发送消息常量 + * @Author syp + * @Date 2020/12/7 17:26 + */ +public interface SdsPtgNoticeConstant { + + /** + * 顺道捎-被修改 + */ + String NOTICE_SDS_UPDATE = "顺道捎【内容修改】"; + /** + * 顺道捎-被删除 + */ + String NOTICE_SDS_DELETE = "顺道捎【被屏蔽】"; + /** + * 拼团购-被修改 + */ + String NOTICE_PTG_UPDATE = "拼团购【内容修改】"; + /** + * 拼团购-被删除 + */ + String NOTICE_PTG_DELETE = "拼团购【被屏蔽】"; + /** + * 消息所属业务类型：SDS_PTG + */ + String NOTICE_BUSINESS_TYPE_SDS_PTG= "sds_ptg"; + /** + * 我的消息类型：1互动通知 + */ + String NOTICE_TYPE_INTERACTIVE_NOTICE = "1"; + + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java new file mode 100644 index 00000000..198a7dd7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/SdsPtgShieldFormDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 顺道捎拼团购屏蔽表单 + * + * @author Liuchuang + * @since 2020/10/23 17:01 + */ +@Data +public class SdsPtgShieldFormDTO implements Serializable { + private static final long serialVersionUID = -3686477439903152467L; + + /** + * 举报问题ID + */ + @NotBlank(message = "记录ID不能为空") + private String id; + + /** + * 屏蔽原因 + */ + @NotBlank(message = "屏蔽原因不能为空") + @Size(min = 1, max = 100, message = "屏蔽原因不能为空且在100个字以内") + private String shieldReason; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java new file mode 100644 index 00000000..eb73aede --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.async; + +import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; +import com.elink.esua.epdc.modules.feign.NewsFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * 新闻通知消息模块 线程任务 + * + * @author work@yujt.net.cn + * @date 2019/9/18 15:39 + */ +@Component +public class NewsTask { + + @Autowired + private NewsFeignClient newsFeignClient; + + /** + * 给用户发送消息 + * + * @param informationDto + * @return void + * @author work@yujt.net.cn + * @date 2019/9/18 15:39 + */ + @Async + public void insertUserInformation(EpdcInformationFormDTO informationDto) { + newsFeignClient.saveInformation(informationDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java new file mode 100644 index 00000000..bc75e5d0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.modules.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; +import com.elink.esua.epdc.modules.feign.fallback.NewsFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 消息模块 + * + * @author work@yujt.net.cn + * @date 2019/9/18 15:37 + */ +@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class) +public interface NewsFeignClient { + + /** + * 给用户发消息 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/18 15:40 + */ + @PostMapping(value = "news/epdc-app/information/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveInformation(@RequestBody EpdcInformationFormDTO formDto); + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java new file mode 100644 index 00000000..0a2c9f20 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.modules.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; +import com.elink.esua.epdc.modules.feign.NewsFeignClient; +import org.springframework.stereotype.Component; + +/** + * @author work@yujt.net.cn + * @date 2019/9/18 15:38 + */ +@Component +public class NewsFeignClientFallback implements NewsFeignClient { + + @Override + public Result saveInformation(EpdcInformationFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveInformation", formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java index 50033973..b0fad3e9 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.GroupBuyInfoDTO; +import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.modules.groupbuy.excel.GroupBuyInfoExcel; import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +92,18 @@ public class GroupBuyInfoController { ExcelUtils.exportExcelToTarget(response, null, list, GroupBuyInfoExcel.class); } + /** + * 屏蔽 + * + * @param formDto 屏蔽 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author songyunpeng + * @since 2020/12/7 16:41 + */ + @PostMapping("shield") + public Result shieldInfo(@RequestBody SdsPtgShieldFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return groupBuyInfoService.modifyGroupBuyShieldFlag(formDto); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java index 2175da51..bf0c5815 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.GroupBuyInfoDTO; import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO; import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO; +import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity; @@ -155,4 +156,12 @@ public interface GroupBuyInfoService extends BaseService { * @return void **/ void modifyOrganizationInfo(OrganizationModifyDTO dto); + /** + * @Description 屏蔽信息 + * @Author songyunpeng + * @Date 2020/12/7 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result modifyGroupBuyShieldFlag(SdsPtgShieldFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java index aa689a13..a78764bb 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.groupbuy.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.async.NewsTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -31,9 +32,12 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.constant.SdsPtgNoticeConstant; import com.elink.esua.epdc.dto.GroupBuyInfoDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO; import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO; +import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO; import com.elink.esua.epdc.modules.feign.AdminFeignClient; @@ -63,6 +67,8 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String groupBuyTitle = (String)params.get("groupBuyTitle"); + String startTime = (String)params.get("startTime"); + String endTime = (String)params.get("endTime"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.like(StringUtils.isNotBlank(groupBuyTitle), "GROUP_BUY_TITLE", groupBuyTitle.trim()); + wrapper.ge(StringUtils.isNotBlank(startTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", startTime); + wrapper.le(StringUtils.isNotBlank(endTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", endTime); + wrapper.orderByAsc("SORT"); + wrapper.orderByDesc("CREATED_TIME"); return wrapper; } @@ -114,6 +128,16 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl eventsList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); @@ -232,6 +260,27 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl list = sdsInfoService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, SdsInfoExcel.class); } - + /** + * 屏蔽 + * + * @param formDto 屏蔽 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author songyunpeng + * @since 2020/12/7 16:41 + */ + @PostMapping("shield") + public Result shieldInfo(@RequestBody SdsPtgShieldFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return sdsInfoService.modifySdsShieldFlag(formDto); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java index 3178b2b2..1caed2cf 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/SdsInfoService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SdsInfoDTO; import com.elink.esua.epdc.dto.form.EpdcAddSdsFormDTO; import com.elink.esua.epdc.dto.form.EpdcSelectSdsInfoListFormDTO; +import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; @@ -155,4 +156,12 @@ public interface SdsInfoService extends BaseService { * @return void **/ void modifyOrganizationInfo(OrganizationModifyDTO dto); + /** + * @Description 屏蔽 + * @Author songyunpeng + * @Date 2020/12/8 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result modifySdsShieldFlag(SdsPtgShieldFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java index 3b504984..58d6fdd5 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/sds/service/impl/SdsInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.sds.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.async.NewsTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -31,9 +32,12 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.constant.SdsPtgNoticeConstant; import com.elink.esua.epdc.dto.SdsInfoDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.form.EpdcAddSdsFormDTO; import com.elink.esua.epdc.dto.form.EpdcSelectSdsInfoListFormDTO; +import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO; import com.elink.esua.epdc.modules.feign.AdminFeignClient; @@ -67,6 +71,9 @@ public class SdsInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String carryStatus = (String)params.get("carryStatus"); + String startTime = (String)params.get("startTime"); + String endTime = (String)params.get("endTime"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(carryStatus), "CARRY_STATUS", carryStatus); + wrapper.ge(StringUtils.isNotBlank(startTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", startTime); + wrapper.le(StringUtils.isNotBlank(endTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", endTime); + wrapper.orderByAsc("SORT"); + wrapper.orderByDesc("CREATED_TIME"); return wrapper; + } @Override @@ -113,6 +129,16 @@ public class SdsInfoServiceImpl extends BaseServiceImpl eventsList = baseDao.selectListOfOrganizationInfo(dto.getDeptId().toString()); @@ -231,6 +261,27 @@ public class SdsInfoServiceImpl extends BaseServiceImpl and t.CARRY_STATUS = '1' - + + and t.USER_ID = #{userId} order by sort,CREATED_TIME desc