11 changed files with 293 additions and 7 deletions
@ -0,0 +1,43 @@ |
|||
package com.ccsens.carbasics.api.manage; |
|||
|
|||
import com.ccsens.carbasics.bean.dto.QuestionnaireDto; |
|||
import com.ccsens.carbasics.service.IManageQuestionnaireService; |
|||
import com.ccsens.cloudutil.annotation.MustLogin; |
|||
import com.ccsens.util.JsonResponse; |
|||
import com.ccsens.util.bean.dto.QueryDto; |
|||
import com.github.pagehelper.PageInfo; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import io.swagger.annotations.ApiParam; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.validation.annotation.Validated; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RequestMethod; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import javax.annotation.Resource; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
@Api(tags = "问查调卷相关接口" , description = "") |
|||
@RestController |
|||
@RequestMapping("/manage/questionnaire") |
|||
@Slf4j |
|||
public class ManageQuestionnaireController { |
|||
|
|||
@Resource |
|||
private IManageQuestionnaireService manageQuestionnaireService; |
|||
|
|||
@MustLogin |
|||
@ApiOperation(value = "后台查看问卷填写记录", notes = "") |
|||
@RequestMapping(value = "/list", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
|||
public JsonResponse<PageInfo<Map<String, String>>> queryQuestionnaireDetail(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.BackQueryQuestionnaire> params) throws Exception{ |
|||
log.info("后台查看问卷填写记录{}", params); |
|||
// 未添加时间条件
|
|||
PageInfo<Map<String, String>> o = manageQuestionnaireService.queryQuestionnaireDetail(params.getParam(), params.getUserId()); |
|||
|
|||
return JsonResponse.newInstance().ok(o); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
package com.ccsens.carbasics.api.manage; |
|||
|
|||
import com.ccsens.carbasics.bean.dto.StatisticalDto; |
|||
import com.ccsens.carbasics.bean.vo.StatisticalVo; |
|||
import com.ccsens.carbasics.service.IStatisticalService; |
|||
import com.ccsens.cloudutil.annotation.MustLogin; |
|||
import com.ccsens.util.JsonResponse; |
|||
import com.ccsens.util.bean.dto.QueryDto; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import io.swagger.annotations.ApiParam; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.validation.annotation.Validated; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RequestMethod; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import javax.annotation.Resource; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: 统计查询 |
|||
* @author: whj |
|||
* @time: 2021/7/28 8:54 |
|||
*/ |
|||
@Api(tags = "统计查询") |
|||
@RestController |
|||
@RequestMapping("/manage/statistical") |
|||
@Slf4j |
|||
public class ManageStatisticalController { |
|||
@Resource |
|||
private IStatisticalService statisticalService; |
|||
|
|||
|
|||
@MustLogin |
|||
@ApiOperation(value = "跑道图", notes = "跑道图") |
|||
@RequestMapping(value = "/runway", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) |
|||
public JsonResponse<StatisticalVo.Common> runway(@ApiParam @Validated @RequestBody QueryDto<StatisticalDto.Time> params) { |
|||
log.info("跑道图：{}", params); |
|||
StatisticalVo.Common common = statisticalService.runway(params.getParam(), params.getUserId()); |
|||
log.info("跑道图结果:{}", common); |
|||
return JsonResponse.newInstance().ok(common); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
package com.ccsens.carbasics.service; |
|||
|
|||
import com.ccsens.carbasics.bean.dto.QuestionnaireDto; |
|||
import com.github.pagehelper.PageInfo; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
public interface IManageQuestionnaireService { |
|||
|
|||
/** |
|||
* 后台查找问卷列表 |
|||
* @param param |
|||
* @param userId |
|||
*/ |
|||
PageInfo<Map<String, String>> queryQuestionnaireDetail(QuestionnaireDto.BackQueryQuestionnaire param, Long userId); |
|||
} |
|||
@ -0,0 +1,74 @@ |
|||
package com.ccsens.carbasics.service; |
|||
|
|||
import cn.hutool.core.util.StrUtil; |
|||
import com.ccsens.carbasics.bean.dto.QuestionnaireDto; |
|||
import com.ccsens.carbasics.bean.vo.CodeVo; |
|||
import com.ccsens.carbasics.bean.vo.QuestionnaireVo; |
|||
import com.ccsens.carbasics.persist.dao.AreaDao; |
|||
import com.ccsens.carbasics.persist.dao.CodeDictionariesDao; |
|||
import com.ccsens.carbasics.persist.dao.QuestionnaireRecordDao; |
|||
import com.ccsens.carbasics.util.Constant; |
|||
import com.ccsens.util.PoiUtil; |
|||
import com.github.pagehelper.PageHelper; |
|||
import com.github.pagehelper.PageInfo; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.poi.ss.usermodel.Workbook; |
|||
import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Propagation; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import javax.annotation.Resource; |
|||
import java.util.ArrayList; |
|||
import java.util.HashMap; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* @author 逗 |
|||
*/ |
|||
@Slf4j |
|||
@Service |
|||
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) |
|||
public class ManageQuestionnaireService implements IManageQuestionnaireService { |
|||
|
|||
@Resource |
|||
private CodeDictionariesDao codeDictionariesDao; |
|||
@Resource |
|||
private QuestionnaireRecordDao questionnaireRecordDao; |
|||
@Resource |
|||
private AreaDao areaDao; |
|||
|
|||
@Override |
|||
public PageInfo<Map<String, String>> queryQuestionnaireDetail(QuestionnaireDto.BackQueryQuestionnaire param, Long userId) { |
|||
String areaCode = "CITY-COUNTY"; |
|||
|
|||
List<String> parentCodes = new ArrayList<>(); |
|||
parentCodes.add("QXXWJ"); |
|||
parentCodes.add("XGZL"); |
|||
List<CodeVo.Basic> codes = codeDictionariesDao.query(parentCodes); |
|||
log.info("code数量:{}", codes.size()); |
|||
|
|||
PageHelper.startPage(param.getPageNum(),param.getPageSize()); |
|||
List<Map<String, String>> records = questionnaireRecordDao.backQueryRecordList(param,codes); |
|||
log.info("记录结束"); |
|||
records.forEach(record ->{ |
|||
String s = record.get(areaCode); |
|||
if (StrUtil.isNotBlank(s)) { |
|||
String[] split = s.split(Constant.STRING_REGEX); |
|||
List<Long> areaIds = new ArrayList<>(); |
|||
for(String id: split) { |
|||
areaIds.add(Long.parseLong(id)); |
|||
} |
|||
List<QuestionnaireVo.AreaBasic> areaBasics = areaDao.queryByIdArr(areaIds); |
|||
StringBuilder area = new StringBuilder(); |
|||
for (QuestionnaireVo.AreaBasic areaBasic : areaBasics) { |
|||
area.append(areaBasic.getName()); |
|||
} |
|||
record.put(areaCode,area.toString()); |
|||
} |
|||
}); |
|||
|
|||
return new PageInfo<>(records); |
|||
} |
|||
} |
|||
@ -1,4 +1,4 @@ |
|||
spring: |
|||
profiles: |
|||
active: prod |
|||
include: common, util-prod |
|||
active: test |
|||
include: common, util-test |
|||
|
|||
Loading…
Reference in new issue