From 001a062c6491b860399cc864117f4520f74389c0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 20 Jul 2021 09:23:03 +0800 Subject: [PATCH 1/6] fy --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index aae5697447..39b8d0d9ed 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -486,7 +486,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol dto.setMobile(formDTO.getMobile()); Result> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto); if (!customerStaffResult.success()) { - logger.error(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); + logger.warn(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } //2、密码是否正确 @@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol if(result.success()&&null!=result.getData()){ return result.getData(); } - logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s", + logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER, formDTO.getMobile(), formDTO.getPassword(), From 744f368844d7701a7e5d8d8d5a73bcab3442a3cd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 09:45:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/SpecialSubjectDTO.java | 4 +++- .../src/main/java/com/epmet/dao/SpecialSubjectDao.java | 2 +- .../main/java/com/epmet/entity/SpecialSubjectEntity.java | 2 +- .../com/epmet/service/impl/SpecialSubjectServiceImpl.java | 6 +++--- .../src/main/resources/mapper/SpecialSubjectDao.xml | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java index 96cb4a1bdf..73e91072f0 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java @@ -103,6 +103,8 @@ public class SpecialSubjectDTO implements Serializable { */ private Date updatedTime; - // 扩展属性 + /** + * 标签名 + */ private String tagName; } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java index 0ada844144..4fcd896952 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java @@ -38,6 +38,6 @@ public interface SpecialSubjectDao extends BaseDao { List queryExistedList(@Param("orgId") String orgId,@Param("notList")List notList); - SpecialSubjectEntity getInfo(@Param("tagId") String tagId); + SpecialSubjectDTO getInfo(@Param("tagId") String tagId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java index 315224b46f..6f0f61ed9a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java @@ -44,7 +44,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity { * 标签id */ private String tagId; - private String tagName; + /** * 新增此专题的用户id */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 7228c102f8..785d2cc6a0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -282,9 +282,9 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl result = new ArrayList<>(); formDTO.getTagIdList().forEach(tagId -> { PreviewResultDTO previewResultDTO = new PreviewResultDTO(); - SpecialSubjectEntity subjectEntity = baseDao.getInfo(tagId); - previewResultDTO.setSpecialSubjectId(subjectEntity.getId()); - previewResultDTO.setTagName(subjectEntity.getTagName()); + SpecialSubjectDTO subject = baseDao.getInfo(tagId); + previewResultDTO.setSpecialSubjectId(subject.getId()); + previewResultDTO.setTagName(subject.getTagName()); previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); result.add(previewResultDTO); }); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml index 4cd83f8b3a..fdc64cb40c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml @@ -28,7 +28,7 @@ order by ss.CREATED_TIME desc - SELECT ss.id, TAG_NAME From 834d9dddeaf5171a58291b8919888a3ba3d2d15d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 09:48:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpecialSubjectServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 785d2cc6a0..0ff3c6fe27 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -280,14 +280,16 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl preview(PreviewFormDTO formDTO) { List result = new ArrayList<>(); - formDTO.getTagIdList().forEach(tagId -> { - PreviewResultDTO previewResultDTO = new PreviewResultDTO(); - SpecialSubjectDTO subject = baseDao.getInfo(tagId); - previewResultDTO.setSpecialSubjectId(subject.getId()); - previewResultDTO.setTagName(subject.getTagName()); - previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); - result.add(previewResultDTO); - }); + if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) { + formDTO.getTagIdList().forEach(tagId -> { + PreviewResultDTO previewResultDTO = new PreviewResultDTO(); + SpecialSubjectDTO subject = baseDao.getInfo(tagId); + previewResultDTO.setSpecialSubjectId(subject.getId()); + previewResultDTO.setTagName(subject.getTagName()); + previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); + result.add(previewResultDTO); + }); + } return result; } From bc827ef81e5b080fbb6334977a3e0a5d5cf3ac63 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 10:44:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice-server/src/main/resources/mapper/ArticleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index d71118e533..c46370b357 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -394,7 +394,7 @@ art.ID AS articleId, art.TITLE AS articleTitle, art.PUBLISHER_NAME AS publishName, - art.PUBLISH_DATE AS publishDate, + date_format(art.PUBLISH_DATE,'%Y-%m-%d') AS publishDate, IFNULL(art.PREVIEW_CONTENT,'') AS articleContent, IFNULL(art.TAGS,'') AS tagName FROM From 9b1bb68886ba7393c88e4256adafd86682d7a063 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Jul 2021 13:31:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffPatrolRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml index bf38f046e1..d3d5b53bb3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml @@ -22,7 +22,7 @@ pr.STAFF_ID = #{userId} ) - GROUP BY pr.STAFF_ID ORDER BY pr.CREATED_TIME DESC)t + ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID From 8ead47489b73044cb533a2b79b5e149b6299d3a5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 20 Jul 2021 15:14:19 +0800 Subject: [PATCH 6/6] tagColor --- .../src/main/java/com/epmet/dto/SpecialSubjectDTO.java | 5 +++++ .../com/epmet/service/impl/SpecialSubjectServiceImpl.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java index 73e91072f0..a943ed22af 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java @@ -107,4 +107,9 @@ public class SpecialSubjectDTO implements Serializable { * 标签名 */ private String tagName; + + /** + * 扩展属性：标签颜色 + */ + private String tagColor; } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 0ff3c6fe27..c8acefc253 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -210,6 +210,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl