From b507b9cec758e5befbaf412033aa0d3db2d50eda Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 29 May 2020 11:06:34 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=BF=97=E5=8F=8B=E6=9C=B5=E6=9C=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/VolunteerInfoDao.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 94f4c39b..71fbb9ca 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -221,9 +221,6 @@ WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 - - and v.GRID_ID = #{gridId} - ORDER BY CONVERT(v.VOLUNTEER_NICKNAME USING gbk) LIMIT #{pageIndex},#{pageSize} From c3a53735f01eedafb2f1f1c7defab6799cfba8b5 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 29 May 2020 18:29:19 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=20=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dao/NewsDao.java | 11 ++++++- .../epdc/service/impl/NewsServiceImpl.java | 29 +++++++++++++++---- .../src/main/resources/mapper/NewsDao.xml | 8 +++++ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java index 500237f8..e436d26c 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java @@ -116,4 +116,13 @@ public interface NewsDao extends BaseDao { * @since 2020/3/7 1:20 */ void updateDeptNameByDeptId(String newDeptName, Long deptId); -} \ No newline at end of file + + /** + * 根据新闻id，查询该新闻 发布到哪些部门 + * @param newsId + * @return java.util.List + * @Author zhangyong + * @Date 18:08 2020-05-29 + **/ + List selectListNewsDepartment(String newsId); +} 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 57dab940..8ebd86cf 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 @@ -135,14 +135,33 @@ public class NewsServiceImpl extends BaseServiceImpl implem public NewsDTO get(String id) { NewsEntity entity = baseDao.selectById(id); NewsDTO dto = ConvertUtils.sourceToTarget(entity, NewsDTO.class); - /*if(StringUtils.isNotBlank(dto.getAllDeptIds())){ - String[] idsShow = dto.getAllDeptIds().split(","); - List ids = Arrays.asList(idsShow); - dto.setAllDeptIdsShow(ids.subList(1,ids.size())); - }*/ + // 通过新闻id，查询新闻关联的部门id + List listDeptId = baseDao.selectListNewsDepartment(dto.getId()); + // 查完整的部门ID + dto.setAllDeptIdsShow(this.getParentAllDeptInfo(listDeptId)); return dto; } + private List getParentAllDeptInfo(List listDeptId){ + // [0,1,2,3] + List allDeptIdsShowList = new ArrayList<>(); + for (Long list : listDeptId){ + // 查询父级部门 + Result parentAndAllDept = adminFeignClient.getParentAndAllDept(list.toString()); + ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); + String allDeptIds = parentAndAllDeptDTO.getAllDeptIds(); + String[] deptIdsShow = allDeptIds.split(","); + Long[] allDeptIdsShowLong = new Long[deptIdsShow.length]; + // 从第一级开始保存 + for (int i = 0; i <= deptIdsShow.length -1; i++){ + allDeptIdsShowLong[i] = Long.valueOf(deptIdsShow[i]); + } + allDeptIdsShowList.add(allDeptIdsShowLong); + } + return allDeptIdsShowList; + } + + @Override @Transactional(rollbackFor = Exception.class) public void save(NewsDTO dto) { 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 36912547..1947990a 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 @@ -156,4 +156,12 @@ UPDATE epdc_news SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId} + + From a72f76ff3bbdfbfb8a8b86a6673cb6ae2ad61aa6 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Sun, 31 May 2020 01:02:37 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 4 ++-- .../epdc-activiti-server/epdc-activiti-server.iml | 9 +++++++++ esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml | 4 ++-- .../epdc-module/epdc-custom/epdc-custom-server/pom.xml | 4 ++-- .../epdc-module/epdc-events/epdc-events-server/pom.xml | 4 ++-- .../epdc-module/epdc-group/epdc-group-server/pom.xml | 4 ++-- .../epdc-module/epdc-heart/epdc-heart-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml | 4 ++-- .../epdc-module/epdc-message/epdc-message-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml | 4 ++-- .../epdc-module/epdc-points/epdc-points-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml | 4 ++-- esua-epdc/epdc-module/epdc-webservice/pom.xml | 4 ++-- .../epdc-websocket/epdc-websocket-server/pom.xml | 4 ++-- 16 files changed, 39 insertions(+), 30 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 8f2b1159..1120fd28 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -236,10 +236,10 @@ 2154e86d56df9fae4224c93a17e01bb3 - + epdc - Elink@833066 + epdc@jinshui888 0 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml index 329b58df..5931f3d1 100644 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml @@ -9,6 +9,15 @@ + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index f9f9ac20..146d28ad 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -282,10 +282,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml index e8e0c72d..6dc16c28 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml @@ -186,10 +186,10 @@ 172.20.0.4:80 - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 037adac4..3f6de287 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -269,10 +269,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index f5db4d39..7a521946 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -202,10 +202,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 4da3a0bf..5520ed64 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -214,10 +214,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 61cfc6c4..7ab8d8af 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -210,10 +210,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 251d2945..7284ae4c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -175,10 +175,10 @@ 172.20.0.4:80 - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index 09456fc2..70da8b90 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -210,10 +210,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index bf77d00c..b73e946b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -187,10 +187,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index 50d43271..db4f1705 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -227,10 +227,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.1.239:22122 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml index 54d9aeb8..1e8eefdf 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml @@ -210,10 +210,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index ea8bcfc3..4e9a3b4a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -207,10 +207,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 172.16.0.7:9876;172.16.0.8:9876 diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index 99b0732d..c32696ba 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -178,10 +178,10 @@ 172.20.0.4:80 - + epdc - Elink@833066 + epdc@jinshui888 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index a3d38602..94b96db6 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -204,10 +204,10 @@ - + epdc - Elink@833066 + epdc@jinshui888 From 7c9212b002bf16d7a0ebe99c9be02a00863dc561 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 2 Jun 2020 16:01:22 +0800 Subject: [PATCH 04/13] =?UTF-8?q?1.=E5=BF=97=E6=84=BF=E8=80=85=20-=20banne?= =?UTF-8?q?r=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0banner=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E9=A1=B9=E3=80=82?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiDicController.java | 34 +++++++++++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 11 ++++++ .../fallback/AdminFeignClientFallback.java | 5 +++ .../elink/esua/epdc/service/AdminService.java | 9 +++++ .../epdc/service/impl/AdminServiceImpl.java | 13 +++++++ .../controller/ActBannerController.java | 13 +++++++ .../activity/service/ActBannerService.java | 11 ++++++ .../service/impl/ActBannerServiceImpl.java | 9 +++++ .../epdc/modules/feign/AdminFeignClient.java | 29 ++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 24 +++++++++++++ 10 files changed, 158 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java new file mode 100644 index 00000000..2a609f03 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiDicController.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.service.AdminService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 字典 + * @Auther: zhangyong + * @Date: 2020-06-02 11:05 + */ +@RestController +@RequestMapping("dic") +public class ApiDicController { + + @Autowired + private AdminService adminService; + + /* + * 获取默认网格信息 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 11:07 2020-06-02 + **/ + @GetMapping("/getDefaultGridInfo") + public Result getDefaultGridInfo() { + String dicType = "default_grid"; + return adminService.getDefaultGridInfo(dicType); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 93a7813b..bdcc6693 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -98,4 +98,15 @@ public interface AdminFeignClient { **/ @GetMapping("sys/dict/listSimple/{dictType}") Result> getListSimpleDictInfo(@PathVariable("dictType") String dictType); + + /** + * 根据数据字典类型获取 获取默认网格信息 + * + * @param dictType 数据字典类型 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 18:40 2020-06-02 + */ + @GetMapping("/sys/dict/listSimple/{dictType}") + Result> getDefaultGridInfoByDicType(@PathVariable("dictType") String dictType); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index d3f757a0..8601787d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -53,4 +53,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getListSimpleDictInfo(String dictType) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType); } + + @Override + public Result> getDefaultGridInfoByDicType(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDefaultGridInfoByDicType", dictType); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java index 55e06883..ef819781 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -20,4 +20,13 @@ public interface AdminService { * @date 2019/9/11 09:46 */ Result getCompleteDeptName(Long gridId); + + /* + * 根据字典类型 获取网格信息 + * @param dicType + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 11:08 2020-06-02 + **/ + Result getDefaultGridInfo(String dicType); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index c5f79982..4b9e7860 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -2,11 +2,14 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author yujintao * @email yujintao@elink-cn.com @@ -33,4 +36,14 @@ public class AdminServiceImpl implements AdminService { .concat(completeDept.getGrid()); return new Result().ok(deptName); } + + @Override + public Result getDefaultGridInfo(String dicType) { + Result> listResult = adminFeignClient.getDefaultGridInfoByDicType(dicType); + if (!listResult.success() || null == listResult) { + return new Result().error("查询默认网格信息失败"); + } + String defaultGrid = listResult.getData().get(0).getDictValue(); + return new Result().ok(defaultGrid); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index 40d0d321..51e77b86 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java @@ -26,6 +26,7 @@ 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.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.modules.activity.excel.ActBannerExcel; import com.elink.esua.epdc.modules.activity.service.ActBannerService; import org.springframework.beans.factory.annotation.Autowired; @@ -103,4 +104,16 @@ public class ActBannerController { ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class); } + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:13 2020-06-02 + **/ + @GetMapping("getBannerType/{dictType}") + public Result> listSimpleDictInfo(@PathVariable("dictType") String dictType){ + return actBannerService.getListSimpleDictInfo(dictType); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index b9180038..a87cdfbf 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; 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.SysSimpleDictDTO; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; import java.util.List; @@ -142,4 +143,14 @@ public interface ActBannerService extends BaseService { * @Date 18:27 2020-05-25 **/ Result> getBannerList(EpdcAppActBannerFormDTO formDto); + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:13 2020-06-02 + **/ + Result> getListSimpleDictInfo(String dictType); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 6476371d..6decb5b2 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -29,10 +29,12 @@ 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.utils.Result; import com.elink.esua.epdc.constant.ActStateConstant; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; import com.elink.esua.epdc.modules.activity.dao.ActBannerDao; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; import com.elink.esua.epdc.modules.activity.redis.ActBannerRedis; import com.elink.esua.epdc.modules.activity.service.ActBannerService; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +57,9 @@ public class ActBannerServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -172,4 +177,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl> getListSimpleDictInfo(String dictType) { + return adminFeignClient.getListSimpleDictInfo(dictType); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java new file mode 100644 index 00000000..c03ee400 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -0,0 +1,29 @@ +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.SysSimpleDictDTO; +import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +/** + * @author zhangyong + * @date 15:13 2020-06-02 + */ +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) +public interface AdminFeignClient { + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:27 2020-05-27 + **/ + @GetMapping("sys/dict/listSimple/{dictType}") + Result> getListSimpleDictInfo(@PathVariable("dictType") String dictType); +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 00000000..da30ee20 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,24 @@ +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.SysSimpleDictDTO; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author zhangyong + * @date 15:13 2020-06-02 + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + @Override + public Result> getListSimpleDictInfo(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType); + } +} From 3af61de6eaf42cbbd4b98d39f3cdc28bbf9969b0 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 2 Jun 2020 16:30:28 +0800 Subject: [PATCH 05/13] =?UTF-8?q?banner=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9Abanner=E7=B1=BB=E5=9E=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0:=200-(=E6=B4=BB=E5=8A=A8/=E5=BF=97=E6=84=BF=E8=80=85b?= =?UTF-8?q?anner)=EF=BC=8C=202-=E5=BF=97=E6=84=BF=E8=80=85=E8=AF=81?= =?UTF-8?q?=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiAppActInfoController.java | 5 +++-- .../esua/epdc/feign/ActInfoFeignClient.java | 3 ++- .../fallback/ActInfoFeignClientFallback.java | 5 +++-- .../esua/epdc/service/ActInfoService.java | 3 ++- .../epdc/service/impl/ActInfoServiceImpl.java | 5 +++-- .../activity/form/EpdcAppBannerFormDTO.java | 22 +++++++++++++++++++ .../controller/ActBannerController.java | 6 ++++- .../mapper/activity/ActBannerDao.xml | 3 +++ 8 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java index cb152614..7abcbc73 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.common.token.dto.TokenDto; @@ -109,7 +110,7 @@ public class ApiAppActInfoController { } @GetMapping("banner/list") - public Result> bannerList() { - return actInfoService.getBannerList(); + public Result> bannerList(EpdcAppBannerFormDTO dto) { + return actInfoService.getBannerList(dto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index 95fd6e0e..0eb24268 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; @@ -61,7 +62,7 @@ public interface ActInfoFeignClient { Result getCancelDetail(@PathVariable String id); @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getBannerList(); + Result> getBannerList(EpdcAppBannerFormDTO dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java index 0dc8b66e..0f2d1a98 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; @@ -42,8 +43,8 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getCancelDetail", id); } @Override - public Result> getBannerList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList"); + public Result> getBannerList(EpdcAppBannerFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList", dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java index f8119a6e..28d7417c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -45,7 +46,7 @@ public interface ActInfoService { Result getCancelDetail(String itemId); - Result> getBannerList(); + Result> getBannerList(EpdcAppBannerFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java index 654ffff5..b84de781 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -47,7 +48,7 @@ public class ActInfoServiceImpl implements ActInfoService { return actInfoFeignClient.getCancelDetail(itemId); } @Override - public Result> getBannerList() { - return actInfoFeignClient.getBannerList(); + public Result> getBannerList(EpdcAppBannerFormDTO dto) { + return actInfoFeignClient.getBannerList(dto); } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java new file mode 100644 index 00000000..7d38b5ea --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.activity.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * banner列表入参 + * + * @author zhangyong + * @since v1.0.0 2020-06-02 + */ +@Data +public class EpdcAppBannerFormDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * banner类型:0-(活动/志愿者banner)， 2-志愿者证书 + */ + private String bannerType; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index 51e77b86..f23dcd05 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.activity.controller; import com.elink.esua.epdc.activity.ActBannerDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; 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; @@ -68,9 +69,12 @@ public class ActBannerController { } @GetMapping("bannerlist") - public Result> getBannerList(){ + public Result> getBannerList(@RequestBody EpdcAppBannerFormDTO dto){ Map params =new HashMap(); params.put("status","1"); + if (null != dto.getBannerType()) { + params.put("bannerType", dto.getBannerType()); + } List data = actBannerService.list(params); return new Result>().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 75ae833d..d0ddd29a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -107,6 +107,9 @@ AND banner.STATUS = #{status} + + AND banner.BANNER_TYPE = #{bannerType} + ORDER BY banner.CREATED_TIME DESC From 9f0d8f2b6f8f2afdf66a581759eaed4d542684d1 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 2 Jun 2020 17:32:04 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85-=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=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/activity/ActInfoDao.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 946d836e..530b433a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -155,13 +155,14 @@ when = ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1' else '0' end when ]]> #{timestamp} - and #{timestamp} then '2' when #{timestamp} and = ]]> #{timestamp} then '3' when #{timestamp} then '4' + WHEN actInfo.ACT_STATUS = '0' + THEN '5' end as actCurrentState, IF(relation.USER_ID = #{userId},'1','0') as signupFlag FROM @@ -170,18 +171,15 @@ and relation.USER_ID = #{userId} and relation.STATUS not in ('3','4') and actInfo.ID = relation.ACT_ID - WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1' + WHERE actInfo.DEL_FLAG = '0' #{timestamp} AND actInfo.ID = #{actId} - - = ]]> #{timestamp} - - #{timestamp} + #{timestamp} ) temp ORDER BY temp.actCurrentState ASC From 1908fc565324725b710895a35c33f7cc2576b4a5 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 09:12:38 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/activity/result/ActInfoDetailAppResultDTO.java | 4 ++++ .../esua/epdc/activity/result/ActInfoDetailResultDTO.java | 5 +++++ .../esua/epdc/modules/activity/entity/ActInfoEntity.java | 4 ++++ .../src/main/resources/mapper/activity/ActInfoDao.xml | 4 +++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java index d03cd1f6..8e057e37 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java @@ -224,4 +224,8 @@ public class ActInfoDetailAppResultDTO implements Serializable { private String failureReason; + /** + * 活动新闻稿 + */ + private String actNewsContent; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java index 6c65730b..a5bc0959 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java @@ -120,4 +120,9 @@ public class ActInfoDetailResultDTO implements Serializable { * 打卡截止时间 */ private Date signinEndTime; + + /** + * 活动新闻稿 + */ + private String actNewsContent; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java index 874b2cfa..1a19f9f3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java @@ -201,4 +201,8 @@ public class ActInfoEntity extends BaseEpdcEntity { */ private Integer actQuotaCategory; + /** + * 活动新闻稿 + */ + private String actNewsContent; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 530b433a..31d3fc6c 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -41,6 +41,7 @@ + @@ -487,7 +488,8 @@ eai.REWARD, eai.PUNISHMENT_POINTS as punishmentPoints, eai.REQUIREMENT as requirement, - eai.ACT_CONTENT as actContent + eai.ACT_CONTENT as actContent, + ACT_NEWS_CONTENT as actNewsContent from epdc_act_info eai where eai.DEL_FLAG='0' and eai.id=#{actId} From bf1352f1c2f84b000be33321379e3d9219b912f9 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 09:58:04 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/activity/ActInfoDTO.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java index b3b13d60..ffa87aa5 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java @@ -215,5 +215,8 @@ public class ActInfoDTO implements Serializable { */ private String bannerUrl; - -} \ No newline at end of file + /** + * 活动新闻稿 + */ + private String actNewsContent; +} From 990c3a14b622a647e7a4ce0ad9bb58eb55d940be Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 15:18:14 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8sql?= =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActInfoDao.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 31d3fc6c..53886f82 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -156,14 +156,13 @@ when = ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1' else '0' end when ]]> #{timestamp} + and #{timestamp} then '2' when #{timestamp} and = ]]> #{timestamp} then '3' when #{timestamp} then '4' - WHEN actInfo.ACT_STATUS = '0' - THEN '5' end as actCurrentState, IF(relation.USER_ID = #{userId},'1','0') as signupFlag FROM @@ -172,7 +171,7 @@ and relation.USER_ID = #{userId} and relation.STATUS not in ('3','4') and actInfo.ID = relation.ACT_ID - WHERE actInfo.DEL_FLAG = '0' + WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1' #{timestamp} From 8d80e57cc26632ef88749c16b1edd1a77bc986dc Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 3 Jun 2020 16:24:57 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index dd49e5c3..93e785b3 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -36,7 +36,7 @@ 47.104.85.99:9002 1.4.13 prod - registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ + registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ 9508 From abe70e390677133e36f86f947142f778b6ddd005 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 16:52:32 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8D=A1=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E3=80=91-=E3=80=90=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=20=E6=89=93=E5=8D=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=20=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ActUserClockLogResultDTO.java | 6 +++++- .../controller/ActUserClockLogController.java | 19 ++++++++++++++++--- .../activity/dao/ActUserClockLogDao.java | 12 ++++++++++-- .../entity/ActUserClockLogEntity.java | 6 +++++- .../service/ActUserClockLogService.java | 11 +++++++++-- .../impl/ActUserClockLogServiceImpl.java | 4 ++++ .../mapper/activity/ActUserClockLogDao.xml | 19 ++++++++++++++++--- .../mapper/activity/ActUserRelationDao.xml | 2 +- 8 files changed, 66 insertions(+), 13 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java index 09d78d87..6b8279ae 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java @@ -88,4 +88,8 @@ public class ActUserClockLogResultDTO implements Serializable { private String[] clockPic; private String clockPics; -} \ No newline at end of file + /** + * 屏蔽标识 0：未屏蔽，1：已屏蔽 + */ + private String shieldFlag; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java index c0ca5423..35fc3326 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java @@ -50,7 +50,7 @@ import java.util.Map; @RestController @RequestMapping("actuserclocklog") public class ActUserClockLogController { - + @Autowired private ActUserClockLogService actUserClockLogService; @@ -60,7 +60,6 @@ public class ActUserClockLogController { @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = actUserClockLogService.getActUserClockLogFromPC(params); - System.out.println(page); return new Result>().ok(page); } @@ -118,4 +117,18 @@ public class ActUserClockLogController { ExcelUtils.exportExcelToTarget(response, null, list, ActUserClockLogExcel.class); } -} \ No newline at end of file + /** + * 屏蔽 用户打卡日志 信息 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 15:56 2020-06-03 + **/ + @PostMapping("updateShieldFlag") + public Result updateShieldFlag(@RequestBody ActUserClockLogResultDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + actUserClockLogService.modifyShieldFlag(dto); + return new Result(); + } +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java index 275f386a..411229e5 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java @@ -35,5 +35,13 @@ import java.util.Map; public interface ActUserClockLogDao extends BaseDao { List getActUserClockLogFromPC(Map params); - -} \ No newline at end of file + + /** + * 屏蔽 用户打卡日志 信息 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 15:56 2020-06-03 + **/ + void updateShieldFlag(ActUserClockLogResultDTO dto); +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java index 198b021e..5c1bff12 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java @@ -78,4 +78,8 @@ public class ActUserClockLogEntity extends BaseEpdcEntity { */ private String effectiveFlag; -} \ No newline at end of file + /** + * 屏蔽标识 0：未屏蔽，1：已屏蔽 + */ + private String shieldFlag; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java index 5fa481ba..df96b42f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java @@ -111,5 +111,12 @@ public interface ActUserClockLogService extends BaseService + @@ -23,6 +24,7 @@ + - \ No newline at end of file + + + UPDATE epdc_act_user_clock_log + SET + + SHIELD_FLAG = #{shieldFlag} + + where id = #{id} + + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml index 05f72d90..5aae7748 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml @@ -224,7 +224,7 @@ auc.ID id from epdc_act_user_relation aur left join epdc_act_user_clock_log auc on aur.ID = auc.ACT_USER_ID - where aur.DEL_FLAG = '0' and auc.DEL_FLAG = '0' + where aur.DEL_FLAG = '0' and auc.DEL_FLAG = '0' and auc.SHIELD_FLAG = '0' and aur.ACT_ID = #{actId} order by auc.CLOCK_TIME desc From ec3ad5b1a3fe709d0613c261986529ab878faede Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 16:56:18 +0800 Subject: [PATCH 12/13] =?UTF-8?q?banner=E5=88=97=E8=A1=A8=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActBannerDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index d0ddd29a..72b8f255 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -111,6 +111,7 @@ AND banner.BANNER_TYPE = #{bannerType} ORDER BY + banner.SORT, banner.CREATED_TIME DESC From 8cebd8979f12b938f96a1c5996d3426c86167a6a Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 3 Jun 2020 18:52:47 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index 93e785b3..dd49e5c3 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -36,7 +36,7 @@ 47.104.85.99:9002 1.4.13 prod - registry-vpc.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ + registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ 9508