elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

英文逗号

dev_shibei_match
yinzuomei 4 years ago
parent
523d14ada0
commit
56a211036c
4 changed files with 49 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
  2. 6
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
  3. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
  4. 57
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

9
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java
View File

@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmettduck.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Description 问卷-数据分析-查看详情
@ -25,9 +24,9 @@ public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{
/**
* 09.22目前产品没要求分页
*/
@NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
private Integer pageNo;
@NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
private Integer pageSize;
//@NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
//private Integer pageNo;
//@NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
//private Integer pageSize;
}

6
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java
View File

@ -1,7 +1,6 @@
package com.epmet.dataaggre.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -123,9 +122,8 @@ public class EpmetTDuckController {
* @date 2021/9/22 1:37 下午
*/
@PostMapping("itemresdetail")
public Result<PageData<List<String>>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
public Result<List<String>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
PageData<List<String>> page=prUserProjectService.queryItemResDetail(formDTO);
return new Result<PageData<List<String>>>().ok(page);
return new Result<List<String>>().ok(prUserProjectService.queryItemResDetail(formDTO));
}
}

2
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java
View File

@ -155,5 +155,5 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
* @author yinzuomei
* @date 2021/9/22 1:37 下午
*/
PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO);
List<String> queryItemResDetail(ItemResDetailFormDTO formDTO);
}

57
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
View File

@ -376,21 +376,22 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
Map<String, Integer> resMap = new HashMap<>();
for (PrUserProjectResultEntity res : resultList) {
JSONObject originalData = JSON.parseObject(res.getOriginalData());
List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
if(CollectionUtils.isEmpty(dtoList)){
log.info(String.format("当前userId：%s，没有填写本题itemId：%s",res.getUserId(),key));
continue;
}
if(originalData.containsKey(key)){
List<CascaderDTO> dtoList = JSON.parseArray(originalData.get(key).toString(), CascaderDTO.class);
if(CollectionUtils.isEmpty(dtoList)){
log.info(String.format("当前userId：%s，没有填写本题itemId：%s",res.getUserId(),key));
continue;
}
for (CascaderDTO cascaderDTO : dtoList) {
if (null != cascaderDTO && !CollectionUtils.isEmpty(cascaderDTO.getLabels())) {
totalCount += 1;
String pathName = StringUtils.join(cascaderDTO.getLabels(), StringUtils.isNotBlank(cascaderExpandStruct.getSeparator()) ? cascaderExpandStruct.getSeparator() : StrConstant.HYPHEN);
Integer count = resMap.get(pathName);
resMap.put(pathName, count == null ? 1 : count + 1);
for (CascaderDTO cascaderDTO : dtoList) {
if (null != cascaderDTO && !CollectionUtils.isEmpty(cascaderDTO.getLabels())) {
totalCount += 1;
String pathName = StringUtils.join(cascaderDTO.getLabels(), StringUtils.isNotBlank(cascaderExpandStruct.getSeparator()) ? cascaderExpandStruct.getSeparator() : StrConstant.HYPHEN);
Integer count = resMap.get(pathName);
resMap.put(pathName, count == null ? 1 : count + 1);
}
}
}
}
detail.put("totalCount", totalCount);
detail.put("profile", resMap);
@ -543,8 +544,34 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
* @date 2021/9/22 1:37 下午
*/
@Override
public PageData<List<String>> queryItemResDetail(ItemResDetailFormDTO formDTO) {
//todo
return null;
public List<String> queryItemResDetail(ItemResDetailFormDTO formDTO) {
List<PrUserProjectResultEntity> resultList=baseDao.selectResults(formDTO.getProjectKey());
if(CollectionUtils.isEmpty(resultList)){
return new ArrayList<>();
}
List<String> stringList=new ArrayList<>();
String key="field".concat(formDTO.getFormItemId());
for(PrUserProjectResultEntity res:resultList){
JSONObject originalData = JSON.parseObject(res.getOriginalData());
if(ProjectItemTypeEnum.INPUT.getValue().equals(formDTO.getType())
||ProjectItemTypeEnum.TEXTAREA.getValue().equals(formDTO.getType())
||ProjectItemTypeEnum.TIME.getValue().equals(formDTO.getType())
||ProjectItemTypeEnum.DATE.getValue().equals(formDTO.getType())){
if(originalData.containsKey(key)){
stringList.add((String) originalData.get(key));
continue;
}
}else if(ProjectItemTypeEnum.TIME_RANGE.getValue().equals(formDTO.getType())
||ProjectItemTypeEnum.DATE_RANGE.getValue().equals(formDTO.getType())){
if(originalData.containsKey(key)){
List<String> originalList= (List<String>) originalData.get(key);
if(!CollectionUtils.isEmpty(originalList)){
String rangeStr=StringUtils.join(originalList,StrConstant.COMMA);
stringList.add(rangeStr);
}
}
}
}
return stringList;
}
}
Write Preview
Loading…
Cancel
Save