From 2f83e6c961888e462b308223dfccbb679e6d9cd4 Mon Sep 17 00:00:00 2001 From: xusd <330628789@qq.com> Date: Thu, 26 Jun 2025 17:55:20 +0800 Subject: [PATCH] feature:增加市民编号,增加AI问答 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java | 82 ++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 38 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java index 270ed62..fdf0fb0 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java @@ -864,7 +864,7 @@ String areaType = request.getParameter("areaType"); terms.put("areaType", areaType); String unitGrades = request.getParameter("unitGrades"); - if(ObjectUtils.isNotEmpty(unitGrades)){ + if (ObjectUtils.isNotEmpty(unitGrades)) { String[] split = unitGrades.split(","); List<String> unitGradeList = new ArrayList<>(); for (String s : split) { @@ -874,7 +874,7 @@ } //统计条件 resolveType 1-化解中,2-已结案,3-不予受理 String resolveType = request.getParameter("resolveType"); - if(ObjectUtils.isNotEmpty(unitGrades)){ + if (ObjectUtils.isNotEmpty(unitGrades)) { terms.put("resolveType", resolveType); } @@ -927,7 +927,7 @@ Map<String, Object> terms = getParameterAll(); String createStart = request.getParameter("createStart"); String createEnd = request.getParameter("createEnd"); - if(ObjectUtils.isEmpty(createStart) || ObjectUtils.isEmpty(createEnd)){ + if (ObjectUtils.isEmpty(createStart) || ObjectUtils.isEmpty(createEnd)) { return ReturnFailUtils.getRepInfo("请选择登记时间区间"); } //计算两个时间的天数 @@ -935,7 +935,7 @@ LocalDate date1 = LocalDate.parse(createStart, formatter); LocalDate date2 = LocalDate.parse(createEnd, formatter); long daysBetween = ChronoUnit.DAYS.between(date1, date2); - if(daysBetween > 366){ + if (daysBetween > 366) { return ReturnFailUtils.getRepInfo("选择登记时间区间不能大于1年"); } @@ -951,47 +951,47 @@ CaseInfoWeExcelDTO caseInfoWeExcelDTO = new CaseInfoWeExcelDTO(); BeanUtils.copyProperties(casePageDTO, caseInfoWeExcelDTO); caseInfoWeExcelDTO.setSysSource("本系统"); - Map<String,String> personMap = new HashMap<>(); + Map<String, String> personMap = new HashMap<>(); //申请人 - if(ObjectUtils.isNotEmpty(casePageDTO.getPlaintiffList())){ + if (ObjectUtils.isNotEmpty(casePageDTO.getPlaintiffList())) { StringBuffer sb = new StringBuffer(); for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getPlaintiffList()) { - if(ObjectUtils.isNotEmpty(casePersonWeDTO.getExtreme()) && casePersonWeDTO.getExtreme().equals(1)){ + if (ObjectUtils.isNotEmpty(casePersonWeDTO.getExtreme()) && casePersonWeDTO.getExtreme().equals(1)) { extreme = "是"; } personMap.put(casePersonWeDTO.getId(), casePersonWeDTO.getTrueName()); - if(CaseBaseConstsEnum.PERSON_CLASS_1.getIndex().equals(casePersonWeDTO.getPerClass())){ + if (CaseBaseConstsEnum.PERSON_CLASS_1.getIndex().equals(casePersonWeDTO.getPerClass())) { sb.append(casePersonWeDTO.getTrueName()); - if(ObjectUtils.isNotEmpty(casePersonWeDTO.getCertiNo())){ + if (ObjectUtils.isNotEmpty(casePersonWeDTO.getCertiNo())) { sb.append("(").append(casePersonWeDTO.getCertiNo()).append(")"); } sb.append("、"); - }else{ + } else { sb.append(casePersonWeDTO.getTrueName()); - if(ObjectUtils.isNotEmpty(casePersonWeDTO.getOrgaCode())){ + if (ObjectUtils.isNotEmpty(casePersonWeDTO.getOrgaCode())) { sb.append("(").append(casePersonWeDTO.getOrgaCode()).append(")"); } sb.append("、"); } } //申请代理人 - if(ObjectUtils.isNotEmpty(casePageDTO.getAgentList())){ + if (ObjectUtils.isNotEmpty(casePageDTO.getAgentList())) { for (CaseAgentWeDTO caseAgentWeDTO : casePageDTO.getAgentList()) { if (CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgentWeDTO.getPerType())) { sb.append(caseAgentWeDTO.getTrueName()); sb.append("("); - if(ObjectUtils.isNotEmpty(caseAgentWeDTO.getCertiNo())){ + if (ObjectUtils.isNotEmpty(caseAgentWeDTO.getCertiNo())) { sb.append(caseAgentWeDTO.getCertiNo()).append(","); } sb.append("代理对象:"); - if(ObjectUtils.isNotEmpty(personMap.get(caseAgentWeDTO.getPersonId()))){ + if (ObjectUtils.isNotEmpty(personMap.get(caseAgentWeDTO.getPersonId()))) { String[] split = caseAgentWeDTO.getPersonId().split(","); Boolean isfrist = true; for (String personId : split) { - if(isfrist){ + if (isfrist) { sb.append(personMap.get(personId)); isfrist = false; - }else{ + } else { sb.append(",").append(personMap.get(personId)); } } @@ -1003,42 +1003,42 @@ caseInfoWeExcelDTO.setPlaintiffs(sb.substring(0, sb.length() - 1)); } //被申请人 - if(ObjectUtils.isNotEmpty(casePageDTO.getDefendantList())){ + if (ObjectUtils.isNotEmpty(casePageDTO.getDefendantList())) { StringBuffer sb = new StringBuffer(); for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getDefendantList()) { personMap.put(casePersonWeDTO.getId(), casePersonWeDTO.getTrueName()); - if(CaseBaseConstsEnum.PERSON_CLASS_1.getIndex().equals(casePersonWeDTO.getPerClass())){ + if (CaseBaseConstsEnum.PERSON_CLASS_1.getIndex().equals(casePersonWeDTO.getPerClass())) { sb.append(casePersonWeDTO.getTrueName()); - if(ObjectUtils.isNotEmpty(casePersonWeDTO.getCertiNo())){ + if (ObjectUtils.isNotEmpty(casePersonWeDTO.getCertiNo())) { sb.append("(").append(casePersonWeDTO.getCertiNo()).append(")"); } sb.append("、"); - }else{ + } else { sb.append(casePersonWeDTO.getTrueName()); - if(ObjectUtils.isNotEmpty(casePersonWeDTO.getOrgaCode())){ + if (ObjectUtils.isNotEmpty(casePersonWeDTO.getOrgaCode())) { sb.append("(").append(casePersonWeDTO.getOrgaCode()).append(")"); } sb.append("、"); } } //被申请代理人 - if(ObjectUtils.isNotEmpty(casePageDTO.getAgentList())){ + if (ObjectUtils.isNotEmpty(casePageDTO.getAgentList())) { for (CaseAgentWeDTO caseAgentWeDTO : casePageDTO.getAgentList()) { if (CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgentWeDTO.getPerType())) { sb.append(caseAgentWeDTO.getTrueName()); sb.append("("); - if(ObjectUtils.isNotEmpty(caseAgentWeDTO.getCertiNo())){ + if (ObjectUtils.isNotEmpty(caseAgentWeDTO.getCertiNo())) { sb.append(caseAgentWeDTO.getCertiNo()).append(","); } sb.append("代理对象:"); - if(ObjectUtils.isNotEmpty(personMap.get(caseAgentWeDTO.getPersonId()))){ + if (ObjectUtils.isNotEmpty(personMap.get(caseAgentWeDTO.getPersonId()))) { String[] split = caseAgentWeDTO.getPersonId().split(","); Boolean isfrist = true; for (String personId : split) { - if(isfrist){ + if (isfrist) { sb.append(personMap.get(personId)); isfrist = false; - }else{ + } else { sb.append(",").append(personMap.get(personId)); } } @@ -1053,10 +1053,10 @@ caseInfoWeExcelDTO.setCreateTime(DateUtils.DateToString(casePageDTO.getCreateTime(), "yyyy/MM/dd")); caseInfoWeExcelDTO.setVisitTime(DateUtils.DateToString(casePageDTO.getVisitTime(), "yyyy/MM/dd")); caseInfoWeExcelDTO.setOccurTime(DateUtils.DateToString(casePageDTO.getOccurTime(), "yyyy/MM/dd")); - caseInfoWeExcelDTO.setPeopleNum(casePageDTO.getPeopleNum()+""); - caseInfoWeExcelDTO.setAmount(casePageDTO.getAmount()+""); + caseInfoWeExcelDTO.setPeopleNum(casePageDTO.getPeopleNum() + ""); + caseInfoWeExcelDTO.setAmount(casePageDTO.getAmount() + ""); caseInfoWeExcelDTO.setExtreme(extreme); - if(ObjectUtils.isNotEmpty(casePageDTO.getMajorStatus())){ + if (ObjectUtils.isNotEmpty(casePageDTO.getMajorStatus())) { switch (casePageDTO.getMajorStatus()) { case 1: caseInfoWeExcelDTO.setMajorStatus("是"); @@ -1066,7 +1066,7 @@ break; } } - caseInfoWeExcelDTO.setSort(i+""); + caseInfoWeExcelDTO.setSort(i + ""); i++; excelList.add(caseInfoWeExcelDTO); } @@ -1115,13 +1115,13 @@ Map<String, Object> terms = getParameterAll(); CaseStatisticsBaseDTO statistics = service.statistics(terms, null); List<CaseInfoWeAreaExcelDTO> excelList = new ArrayList<>(); - if(ObjectUtils.isNotEmpty(statistics.getAreaList())){ + if (ObjectUtils.isNotEmpty(statistics.getAreaList())) { int i = 1; for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : statistics.getAreaList()) { CaseInfoWeAreaExcelDTO caseInfoWeAreaExcelDTO = new CaseInfoWeAreaExcelDTO(); BeanUtils.copyProperties(caseStatisticsAreaDTO, caseInfoWeAreaExcelDTO); - caseInfoWeAreaExcelDTO.setSort(i+""); - caseInfoWeAreaExcelDTO.setFinishNUm(caseStatisticsAreaDTO.getResolveNum()+caseStatisticsAreaDTO.getUnResolveNum()); + caseInfoWeAreaExcelDTO.setSort(i + ""); + caseInfoWeAreaExcelDTO.setFinishNUm(caseStatisticsAreaDTO.getResolveNum() + caseStatisticsAreaDTO.getUnResolveNum()); excelList.add(caseInfoWeAreaExcelDTO); i++; } @@ -1314,7 +1314,7 @@ String ledgerType = request.getParameter("ledgerType"); //所有表里面的数据都是本系统,其他的后续会新建表存储 - if(ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)){ + if (ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)) { terms.put("canal", "-1"); } return ReturnSucUtils.getRepInfo("处理成功", service.ledger(terms, userId, ledgerType)); @@ -1339,7 +1339,7 @@ String ledgerType = request.getParameter("ledgerType"); //所有表里面的数据都是本系统,其他的后续会新建表存储 - if(ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)){ + if (ObjectUtils.isNotEmpty(ledgerType) && !"1".equals(ledgerType)) { terms.put("canal", "-1"); } return ReturnSucUtils.getRepInfo("处理成功", service.ledgerCount(terms, userId)); @@ -1351,13 +1351,14 @@ /** * 查询重复事项 - * @url {ctx}/api/web/caseInfo/listRepeatCase + * * @param caseId 案件编号 * @param userId 登录用户 * @return Object + * @url {ctx}/api/web/caseInfo/listRepeatCase */ @GetMapping("/listRepeatCase") - public Object listRepeatCase( @RequestParam(value = "caseId") String caseId, @CurrentUser String userId) { + public Object listRepeatCase(@RequestParam(value = "caseId") String caseId, @CurrentUser String userId) { try { return ReturnSucUtils.getRepInfo(caseRepeatService.listRepeatCase(caseId)); } catch (Exception e) { @@ -1367,8 +1368,8 @@ } /** - * * 协同推送-网格推送案件入库 + * * @param registerSaveDTO 实体对象 * @url {ctx}/api/web/caseInfo/gridCaseRegister */ @@ -1381,4 +1382,9 @@ return ReturnFailUtils.getRepInfo(e.getMessage()); } } + + @GetMapping("/getCaseNo") + public R<String> getCaseNo(@CurrentUser String userId) { + return service.createCaseNo(userId); + } } -- Gitblit v1.8.0