diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/DeptVolunteerResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/DeptVolunteerResultDTO.java new file mode 100644 index 00000000..993ec5a8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/DeptVolunteerResultDTO.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/15 13:41 + */ +@Data +public class DeptVolunteerResultDTO implements Serializable { + private static final long serialVersionUID = 4029749279983587695L; + + /** + * 志愿者ID + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 姓名 + */ + private String realName; + + /** + * 身份证 + */ + private String identityNo; + + /** + * 手机号 + */ + private String mobile; + + /** + * 志愿者标签 + */ + private String tagName; + + /** + * 志愿者签名 + */ + private String volunteerSignature; + + /** + * 居住地址 + */ + private String address; + + /** + * 公益积分 + */ + private Integer volunteerPoints; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java new file mode 100644 index 00000000..b3b70183 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsRecordsResultDTO.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/15 14:45 + */ +@Data +public class VolunteerPointsRecordsResultDTO implements Serializable { + private static final long serialVersionUID = -286937478420813680L; + + /** + * 积分记录ID + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 活动名称 + */ + private String actName; + + /** + * 积分记录时间 + */ + private String operationTime; + + /** + * 积分 + */ + private Integer volunteerPoints; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsStaticResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsStaticResultDTO.java new file mode 100644 index 00000000..556a3c32 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/VolunteerPointsStaticResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/7/14 16:56 + */ +@Data +public class VolunteerPointsStaticResultDTO implements Serializable { + private static final long serialVersionUID = 103978565192164909L; + + /** + * 志愿者部门ID + */ + private String id; + + /** + * 志愿者部门ID + */ + private String deptName; + + /** + * 志愿者数量 + */ + private String volunteerNum; + + /** + * 志愿者公益积分总数 + */ + private String volunteerPoints; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 18e5c522..9411e247 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -133,9 +133,9 @@ false - 47.105.119.155:8848 + 115.29.142.202:8848 - 1da17390-6495-4e16-9ec6-0b8ece18a4a0 + 9c6a1a78-690f-4cfe-833b-f8cec174c6e8 https://epmet-dev.elinkservice.cn/api 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e @@ -162,9 +162,10 @@ true - 47.105.119.155:8848 - 47.105.119.155 - 1da17390-6495-4e16-9ec6-0b8ece18a4a0 + 115.29.142.202:8848 + 47.104.94.220 + 9c6a1a78-690f-4cfe-833b-f8cec174c6e8 + https://epmet-dev.elinkservice.cn/api 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e d44a6daaea58be408bb74fe93714710f diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java new file mode 100644 index 00000000..a880e9f3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/VolunteerPointsAnalysisCotroller.java @@ -0,0 +1,71 @@ +package com.elink.esua.epdc.modules.user.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; +import com.elink.esua.epdc.modules.user.service.VolunteerPointsAnalysisService; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * 志愿者公益积分统计 + * + * @Author：liuchuang + * @Date：2021/7/14 16:52 + */ +@RestController +@RequestMapping("volunteer") +public class VolunteerPointsAnalysisCotroller { + + @Autowired + VolunteerPointsAnalysisService volunteerPointsAnalysisService; + + /** + * PC端志愿者公益积分管理列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/14 17:06 + */ + @GetMapping("volunteerpointsstatic") + public Result> volunteerPointsStatic(@RequestParam Map params) { + PageData data = volunteerPointsAnalysisService.volunteerPointsStatic(params); + return new Result>().ok(data); + } + + /** + * 公益积分管理-志愿者列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/15 13:35 + */ + @GetMapping("volunteers") + public Result> volunteers(@RequestParam Map params) { + PageData data = volunteerPointsAnalysisService.listOfVolunteers(params); + return new Result>().ok(data); + } + + /** + * 公益积分管理-积分记录列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/15 13:35 + */ + @GetMapping("volunteerPointsRecords") + public Result> volunteerPointsRecords(@RequestParam Map params) { + PageData data = volunteerPointsAnalysisService.volunteerPointsRecords(params); + return new Result>().ok(data); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java new file mode 100644 index 00000000..5e763e0d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/VolunteerPointsAnalysisDao.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.modules.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * @Author：liuchuang + * @Date：2021/7/14 17:02 + */ +@Mapper +public interface VolunteerPointsAnalysisDao extends BaseMapper { + + /** + * PC端志愿者公益积分管理列表 + * + * @param params + * @return java.util.List + * @author liuchuang + * @since 2021/7/14 17:12 + */ + List volunteerPointsStatic(Map params); + + /** + * 公益积分管理-志愿者列表 + * + * @return java.util.List + * @author liuchuang + * @since 2021/7/15 13:38 + */ + List selectListOfVolunteers(Map params); + + /** + * 公益积分管理-积分记录列表 + * + * @param params + * @return java.util.List + * @author liuchuang + * @since 2021/7/15 14:51 + */ + List volunteerPointsRecords(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java new file mode 100644 index 00000000..fb408d22 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/VolunteerPointsAnalysisService.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.modules.user.service; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; + +import java.util.Map; + +/** + * @Author：liuchuang + * @Date：2021/7/14 17:00 + */ +public interface VolunteerPointsAnalysisService { + + /** + * PC端志愿者公益积分管理列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2021/7/14 17:06 + */ + PageData volunteerPointsStatic(Map params); + + /** + * 公益积分管理-志愿者列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author liuchuang + * @since 2021/7/15 13:36 + */ + PageData listOfVolunteers(Map params); + + /** + * 公益积分管理-积分记录列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author liuchuang + * @since 2021/7/15 14:48 + */ + PageData volunteerPointsRecords(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java new file mode 100644 index 00000000..bd6f7f44 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/VolunteerPointsAnalysisServiceImpl.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.modules.user.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.user.result.DeptVolunteerResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsRecordsResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; +import com.elink.esua.epdc.modules.user.dao.VolunteerPointsAnalysisDao; +import com.elink.esua.epdc.modules.user.service.VolunteerPointsAnalysisService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @Author：liuchuang + * @Date：2021/7/14 17:00 + */ +@Service +public class VolunteerPointsAnalysisServiceImpl extends BaseServiceImpl implements VolunteerPointsAnalysisService { + + @Override + public PageData volunteerPointsStatic(Map params) { + IPage iPage = this.getPage(params); + List list = baseDao.volunteerPointsStatic(params); + return new PageData<>(list, iPage.getTotal()); + } + + @Override + public PageData listOfVolunteers(Map params) { + IPage iPage = this.getPage(params); + List list = baseDao.selectListOfVolunteers(params); + return new PageData<>(list, iPage.getTotal()); + } + + @Override + public PageData volunteerPointsRecords(Map params) { + IPage iPage = this.getPage(params); + List list = baseDao.volunteerPointsRecords(params); + return new PageData<>(list, iPage.getTotal()); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml new file mode 100644 index 00000000..3863f027 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/VolunteerPointsAnalysisDao.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java index 6a8aa38a..bac4e41f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.controller; +import cn.hutool.db.Page; 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; @@ -26,6 +27,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.VolunteerDeptDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.VolunteerDeptModifyFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO; import com.elink.esua.epdc.service.VolunteerDeptService; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerDeptDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerDeptDao.java index 8008ba28..92e97cfd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerDeptDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerDeptDao.java @@ -18,11 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO; import com.elink.esua.epdc.entity.VolunteerDeptEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 志愿者部门管理 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerDeptService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerDeptService.java index 0af49aa5..5cb5025d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerDeptService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerDeptService.java @@ -20,6 +20,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.dto.VolunteerDeptDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.VolunteerDeptModifyFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO; import com.elink.esua.epdc.entity.VolunteerDeptEntity; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerDeptServiceImpl.java index 0c1c5f00..5bd99a8c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerDeptServiceImpl.java @@ -26,8 +26,10 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.VolunteerDeptDao; import com.elink.esua.epdc.dto.VolunteerDeptDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.VolunteerDeptModifyFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO; +import com.elink.esua.epdc.dto.user.result.VolunteerPointsStaticResultDTO; import com.elink.esua.epdc.entity.VolunteerDeptEntity; import com.elink.esua.epdc.service.VolunteerDeptService; import org.apache.commons.lang3.StringUtils;