diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java new file mode 100644 index 0000000000..e8aaee1205 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ProjectKeyCommonDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dataaggre.dto.epmettduck.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description projectKey通用 + * @Author yinzuomei + * @Date 2021/9/16 1:32 下午 + */ +@Data +public class ProjectKeyCommonDTO implements Serializable { + + /** + * 问卷id, 对应pr_user_project.key + */ + private String projectKey; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java new file mode 100644 index 0000000000..c5df187969 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ProjectProfileResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dataaggre.dto.epmettduck.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 统计图标,上面的一行 + * @Author yinzuomei + * @Date 2021/9/16 2:10 下午 + */ +@Data +public class ProjectProfileResultDTO implements Serializable { + private static final long serialVersionUID = -6087175682515652086L; + + /** + * 问卷id, 对应pr_user_project.key + */ + private String projectKey; + + /** + * 采集数量 + */ + private Integer collectionTotal; + + //CREATE(1, "未发布"), + //RELEASE(2, "收集中"), + //STOP(3, "停止发布"); + private Integer status; + + /** + * 采集数量 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java index 746983fdef..72497378a7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java @@ -1,5 +1,12 @@ package com.epmet.dataaggre.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO; +import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; +import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,4 +18,24 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("questionnaire") public class EpmetTDuckController { + @Autowired + private PrUserProjectService prUserProjectService; + + + /** + * 问卷概要 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/9/16 2:54 下午 + */ + @PostMapping("projectprofile") + public Result queryProjectProfile(@RequestBody ProjectKeyCommonDTO formDTO){ + return new Result().ok(prUserProjectService.queryProjectProfile(formDTO.getProjectKey())); + } + + + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java index 3076d5647f..ed184e415f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.dao.epmettduck; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import org.apache.ibatis.annotations.Mapper; @@ -12,5 +13,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PrUserProjectDao extends BaseDao { - + /** + * 问卷概要 + * + * @param projectKey + * @return com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO + * @author yinzuomei + * @date 2021/9/16 2:58 下午 + */ + ProjectProfileResultDTO queryProjectProfile(String projectKey); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java index d778e1d9f4..9ff485770a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; +import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import java.util.List; @@ -92,4 +93,14 @@ public interface PrUserProjectService extends BaseService { * @date 2021-09-15 */ void delete(String[] ids); + + /** + * 问卷概要 + * + * @param projectKey + * @return com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO + * @author yinzuomei + * @date 2021/9/16 2:54 下午 + */ + ProjectProfileResultDTO queryProjectProfile(String projectKey); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 14e46b87d8..27c2f60212 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -20,15 +20,15 @@ package com.epmet.dataaggre.service.epmettduck.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; +import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -97,4 +97,17 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl - + + \ No newline at end of file