diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml index 7aac5ae03..463d70acd 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml @@ -166,9 +166,7 @@ 394f47d4e08fc0fd629231d3f68a34dc 47.104.85.99:9876;114.215.125.123:9876 - organizationGroup - categoryGroup - categoryGroup + contentSecurityGroup diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckCodeController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckCodeController.java index a9640ca53..150bfc8c5 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckCodeController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckCodeController.java @@ -26,6 +26,7 @@ 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.CheckCodeDTO; +import com.elink.esua.epdc.entity.CheckCodeEntity; import com.elink.esua.epdc.excel.CheckCodeExcel; import com.elink.esua.epdc.service.CheckCodeService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +92,16 @@ public class CheckCodeController { ExcelUtils.exportExcelToTarget(response, null, list, CheckCodeExcel.class); } + /** + * @describe: 根据type获取字典数据 + * @author wangtong + * @date 2020/7/14 9:33 + * @param [type] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getResourcesByType") + public Result> getResourcesByType(String type){ + return checkCodeService.getResourcesByType(type); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckCodeDao.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckCodeDao.java index 128deaafd..22029ecc4 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckCodeDao.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckCodeDao.java @@ -20,6 +20,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.CheckCodeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 检测编码信息表 @@ -29,5 +32,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CheckCodeDao extends BaseDao { - + + /** + * @describe: 根据type获取字典数据 + * @author wangtong + * @date 2020/7/14 9:35 + * @param [type] + * @return java.util.List + */ + List getResourcesByType(@Param("type") String type); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/RejectRecordDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/RejectRecordDTO.java new file mode 100644 index 000000000..767031f06 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/RejectRecordDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.rocketmq.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * 组织机构信息修改-发送MQ消息DTO + * + * @Author： wangtong + * @Date： 2020/7/14 14:58 + */ +@Data +public class RejectRecordDTO implements Serializable { + + private static final long serialVersionUID = 3032661994413974324L; + /** + * 用户ID + */ + private String userId; + + /** + * 关联信息ID + */ + private String relationId; +} diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/RejectCheckRecordProducer.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/RejectCheckRecordProducer.java new file mode 100644 index 000000000..c366be8a1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/RejectCheckRecordProducer.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.rocketmq.producer; + +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.spring.core.RocketMQTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * 驳回待审核信息-发送MQ消息 + * + * @Author：wangtong + * @Date：2020/7/14 11:22 + */ +@Slf4j +@Component +public class RejectCheckRecordProducer { + + @Autowired + private RocketMQTemplate rocketMQTemplate; + + /** + * @describe: 发送消息 + * @author wangtong + * @date 2020/7/14 11:22 + * @params [topic, tag, keys, body] + * @return void + */ + public void sendMessage(String topic, String tag, String keys, String body) { + Message message = new Message(topic, tag, keys, body.getBytes()); + try { + SendResult sendResult = rocketMQTemplate.getProducer().send(message); + log.info("EPDC-CONTENT-SECURITY-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId()); + } catch (Exception e) { + log.error("EPDC-CONTENT-SECURITY-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body); + e.printStackTrace(); + } + } + +} diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckCodeService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckCodeService.java index 71e07d2e4..c731fb206 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckCodeService.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckCodeService.java @@ -19,6 +19,7 @@ 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.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CheckCodeDTO; import com.elink.esua.epdc.entity.CheckCodeEntity; @@ -92,4 +93,13 @@ public interface CheckCodeService extends BaseService { * @date 2020-07-03 */ void delete(String[] ids); + + /** + * @describe: 根据type获取字典数据 + * @author wangtong + * @date 2020/7/14 9:33 + * @param [type] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getResourcesByType(String type); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckCodeServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckCodeServiceImpl.java index 375d03601..6c39b4a04 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckCodeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckCodeServiceImpl.java @@ -23,6 +23,7 @@ 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.commons.tools.utils.Result; import com.elink.esua.epdc.dao.CheckCodeDao; import com.elink.esua.epdc.dto.CheckCodeDTO; import com.elink.esua.epdc.entity.CheckCodeEntity; @@ -101,4 +102,10 @@ public class CheckCodeServiceImpl extends BaseServiceImpl> getResourcesByType(String type) { + List result = baseDao.getResourcesByType(type); + return new Result>().ok(result); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java index 853476889..b668e2d40 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java @@ -17,12 +17,15 @@ package com.elink.esua.epdc.service.impl; +import com.alibaba.fastjson.JSONObject; 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.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; +import com.elink.esua.epdc.commons.tools.security.content.ModuleName; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -31,6 +34,8 @@ import com.elink.esua.epdc.dto.CheckResultDTO; import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO; import com.elink.esua.epdc.entity.*; import com.elink.esua.epdc.redis.CheckResultRedis; +import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO; +import com.elink.esua.epdc.rocketmq.producer.RejectCheckRecordProducer; import com.elink.esua.epdc.service.CheckResultService; import com.elink.esua.epdc.service.ViolationsRecordsImgsService; import org.apache.commons.lang3.StringUtils; @@ -67,6 +72,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -120,12 +128,13 @@ public class CheckResultServiceImpl extends BaseServiceImpl vioImgList = new ArrayList<>(); - List recordImgs = checkRecordsImgsDao.selectListByRecordId(records.getId()); + List recordImgs = checkRecordsImgsDao.selectListByRecordId(record.getId()); for(CheckRecordsImgsEntity recordImg : recordImgs){ ViolationsRecordsImgsEntity vioImgEntity = new ViolationsRecordsImgsEntity(); vioImgEntity.setReferenceId(violationEntity.getId()); @@ -153,6 +162,24 @@ public class CheckResultServiceImpl extends BaseServiceImpl().ok("处理成功"); } diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/application.yml index 93931aa69..0b767d324 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/application.yml @@ -137,7 +137,5 @@ wx: rocketmq: name-server: @rocketmq.name.server@ producer: - group: @rocketmq.producer.category.group@ - consumer: - group: @rocketmq.consumer.group@ - category-group: @rocketmq.consumer.category.group@ + group: @rocketmq.producer.contentSecurity.group@ + diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckCodeDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckCodeDao.xml index 36cd3c2bf..9f0249609 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckCodeDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckCodeDao.xml @@ -15,6 +15,9 @@ + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml index 074756efa..10b135d4a 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml @@ -70,6 +70,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index c95881d24..dce538d99 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -153,18 +153,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), - commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, - null,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if (contentResult != null && !contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), + commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常：" + contentResult); + logger.error("未进入违规信息记录：" + contentResult); } IssueEntity issueEntity = null; @@ -268,7 +266,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem List textList = new ArrayList<>(); textList.add(evaluationFormDTO.getEvaluationContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if (contentResult != null && !contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常：" + contentResult); + logger.error("未进入违规信息记录：" + contentResult); } ItemEntity itemEntity = new ItemEntity(); @@ -340,7 +338,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.updateById(itemEntity); //判断是否为待审核 - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + if (contentResult != null) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java index 2e607332e..ed50f24bb 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java @@ -134,18 +134,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), - commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult, - null,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if (contentResult != null && !contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), + commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常：" + contentResult); + logger.error("未进入违规信息记录：" + contentResult); } TopicCommentEntity commentEntity = new TopicCommentEntity(); @@ -210,7 +208,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp textList.add(formDto.getTopicContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages()); - if (contentResult != null && imgResult != null - && 200 == contentResult.getDetails().get(0).getCode() - && 200 == imgResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass() || !imgResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), - formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,contentResult, imgResult,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){ + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), + formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, + formDto.getImages(), null,contentResult, imgResult,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常contentResult：" + contentResult + "---imgResult:" + imgResult); + logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult); } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); @@ -236,9 +232,7 @@ public class TopicServiceImpl extends BaseServiceImpl imp groupTopicUserReadService.insertBatch(readEntities); //保存待审核记录 - if (contentResult != null && imgResult != null - && 200 == contentResult.getDetails().get(0).getCode() - && 200 == imgResult.getDetails().get(0).getCode()) { + if (contentResult != null || imgResult != null) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 3c5a4c607..5aafdb57d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -154,19 +154,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); @@ -361,9 +357,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl