From bf60b2db1b3c845d9bacc7c8f0cb594cbd6f9aef Mon Sep 17 00:00:00 2001 From: pengwei Date: Fri, 27 Jun 2025 16:57:20 +0800 Subject: [PATCH] =?UTF-8?q?fit:1=E3=80=81=E4=BA=BA=E5=91=98=E6=8A=BD?= =?UTF-8?q?=E6=A3=80=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E6=9D=83=E6=95=B0=E6=8D=AE=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B3=E3=80=81=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../supervision/config/InterceptorConfig.java | 2 +- .../data/DataPetitionComplaintController.java | 15 +- .../data/VideoInspectionController.java | 1 - .../datav/DataVAuditController.java | 4 - .../datav/DataVCaseVerifController.java | 9 +- .../datav/DataVGlobalController.java | 18 +- .../controller/datav/DataVJwpyController.java | 3 - .../datav/DataVMailViewController.java | 5 +- .../datav/DataVRightsComfortController.java | 40 ++- .../datav/DataVVideoSuperviseController.java | 5 +- .../mobileSupervision/SamplingController.java | 101 ++++++++ .../rightsComfort/SuperviseController.java | 11 +- .../subdatav/SubOneCaseVerifController.java | 1 - .../subdatav/SubOneGlobalController.java | 4 - .../subdatav/SubOneMailViewController.java | 1 - .../subdatav/SubOneRightsController.java | 6 - .../SubOneSupervisionNotifyController.java | 3 - .../SubOneVideoSuperviseController.java | 1 - .../controller/system/DepartController.java | 1 - .../work/ConfinementController.java | 6 - .../controller/work/NegativeController.java | 1 - .../java/com/biutag/supervision/job/Job.java | 11 +- .../DataAlarmDispositionInfoMapper.java | 2 +- .../mapper/DataPetition12337Mapper.java | 1 - .../mapper/DataPetitionComplaintMapper.java | 13 + .../biutag/supervision/mapper/MailMapper.java | 9 +- .../mapper/NegativeFileMapper.java | 2 +- .../supervision/mapper/NegativeMapper.java | 5 +- .../mapper/NegativeProblemRelationMapper.java | 9 +- .../mapper/NegativeScorePoliceMapper.java | 1 - .../mapper/RiskModelTaskClueMapper.java | 3 +- .../mapper/RiskPersonalMapper.java | 2 +- .../supervision/mapper/RpcApplyMapper.java | 1 + .../mapper/RpcApplyPersonMapper.java | 1 - .../mapper/RpcApplySuperviseMapper.java | 1 - .../mapper/RpcApplyWorkMapper.java | 2 +- .../mapper/RpcInfringerResultMapper.java | 8 + .../supervision/mapper/SamplingMapper.java | 12 +- .../mapper/SupTaskInspectionMapper.java | 2 +- .../supervision/mapper/SupTaskMapper.java | 3 +- .../mapper/SupTaskSelfexaminationMapper.java | 3 +- .../mapper/SupTaskTestingAlcoholMapper.java | 2 +- .../SupTaskTestingAlcoholPeopleMapper.java | 3 +- .../pojo/domain/RpcApplyDetail.java | 1 - .../supervision/pojo/dto/ConfinementDto.java | 2 - .../pojo/dto/DataPetition12337Distribute.java | 3 - .../pojo/dto/ModelClueTaskDistribute.java | 1 - .../dto/NegativeImportDistributeAuditDto.java | 1 - .../biutag/supervision/pojo/dto/NewsDto.java | 1 - .../pojo/dto/SamplingPoliceDto.java | 18 ++ .../supervision/pojo/dto/flow/VerifyData.java | 2 - .../pojo/entity/DwdAsjZfbaAjjbxx.java | 6 +- .../pojo/entity/RpcApplyPerson.java | 3 + .../supervision/pojo/entity/Sampling.java | 5 +- .../pojo/entity/SamplingPolice.java | 9 +- .../pojo/vo/ConfinementExcelVo.java | 3 - .../supervision/pojo/vo/ConfinementVo.java | 3 - .../pojo/vo/DataPetition12337ExportVo.java | 5 +- .../pojo/vo/DataPetition12337Vo.java | 8 +- .../pojo/vo/DataPetitionComplaintVo.java | 2 - .../pojo/vo/ExPortConfinement.java | 2 - .../pojo/vo/ExportNegativeBlameVo.java | 2 +- .../supervision/pojo/vo/ExportNegativeVo.java | 2 +- .../supervision/pojo/vo/GlobalMapIconVo.java | 5 - .../biutag/supervision/pojo/vo/ModelVo.java | 2 +- .../pojo/vo/NegativeAuditExportVo.java | 6 +- .../supervision/pojo/vo/NegativeHdjq.java | 1 - .../biutag/supervision/pojo/vo/NewsVo.java | 3 - .../biutag/supervision/pojo/vo/PoliceVo.java | 38 +++ .../pojo/vo/RecentMailTrendByDayVo.java | 2 - .../supervision/pojo/vo/RiskPersonalVo.java | 2 +- .../supervision/pojo/vo/RpcSuperviseVo.java | 1 - .../supervision/pojo/vo/SamplingVo.java | 52 ++-- .../supervision/pojo/vo/TaskCountVo.java | 1 - .../pojo/vo/TaskSelfexaminationVo.java | 1 - .../biutag/supervision/pojo/vo/TokenVo.java | 1 - .../pojo/vo/VideoInspectionInfo.java | 1 - .../pojo/vo/VideoSuperviseCountVo.java | 1 - .../pojo/vo/VideoSuperviseMapIconVo.java | 2 - .../service/CaseVerificationService.java | 8 - .../service/ConfinementService.java | 11 - .../service/DataGlobalService.java | 4 - .../supervision/service/DataMailService.java | 10 +- .../DataSupervisionNotifyServiceImpl.java | 14 -- .../supervision/service/DataVJwpyService.java | 9 - .../service/NegativeBookService.java | 1 - .../service/NegativeWorkService.java | 2 +- .../service/RpcApplyApproveService.java | 1 - .../supervision/service/RpcApplyService.java | 28 ++- .../service/RpcApplySuperviseService.java | 42 ++-- .../service/RpcApplyWorkService.java | 2 - .../service/RpcPacksComfortService.java | 1 - .../supervision/service/SampliingService.java | 128 ---------- .../supervision/service/SamplingService.java | 237 ++++++++++++++++++ .../supervision/service/SubOneService.java | 6 - .../SubOneSupervisionNotifyService.java | 1 - .../service/SubOneVideoSuperviseService.java | 1 - .../service/SupTaskTestingAlcoholService.java | 1 - .../service/VideoSuperviseService.java | 14 -- .../supervision/util/IDCardInfoExtractor.java | 45 ++++ src/main/resources/application-dev.yml | 6 + src/main/resources/logback-spring.xml | 4 +- src/main/resources/mapper/RpcApplyMapper.xml | 2 +- .../resources/mapper/RpcApplyWorkMapper.xml | 2 +- src/main/resources/mapper/SamplingMapper.xml | 130 ++++++++++ .../resources/mapper/SupTaskProblemMapper.xml | 4 +- .../mapper/SupTaskSelfexaminationMapper.xml | 2 +- .../mapper/SupTaskTestingAlcoholMapper.xml | 2 +- .../SupTaskTestingAlcoholPeopleMapper.xml | 2 +- .../java/com/biutag/supervision/StrUtil.java | 5 - .../java/com/biutag/supervision/TestCase.java | 4 - .../service/DataMailServiceTest.java | 6 +- 113 files changed, 835 insertions(+), 439 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java create mode 100644 src/main/java/com/biutag/supervision/pojo/dto/SamplingPoliceDto.java create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java delete mode 100644 src/main/java/com/biutag/supervision/service/SampliingService.java create mode 100644 src/main/java/com/biutag/supervision/service/SamplingService.java create mode 100644 src/main/java/com/biutag/supervision/util/IDCardInfoExtractor.java diff --git a/pom.xml b/pom.xml index 1657e0e..73ae78c 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,13 @@ spring-boot-starter-data-redis-reactive + + + + com.dameng + DmJdbcDriver18 + 8.1.3.140 + diff --git a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java index 0bb02a9..4b48491 100644 --- a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java +++ b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java @@ -47,7 +47,7 @@ public class InterceptorConfig implements WebMvcConfigurer { .excludePathPatterns("/common/**") .excludePathPatterns("/app/**") // excel导出 - .excludePathPatterns("/data/petitionComplaint12337/export/result", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export") + .excludePathPatterns("/data/petitionComplaint12337/export/result","/sampling/export/samplingPoling", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export") .excludePathPatterns(List.of("/doc.html", "/webjars/**", "/favicon.ico", "/v3/api-docs/**")); registry.addInterceptor(new ApiInterceptor()) .addPathPatterns("/api/jwdc/**"); diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java index e43fdac..a127664 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java +++ b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java @@ -3,6 +3,7 @@ package com.biutag.supervision.controller.data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; @@ -24,9 +25,6 @@ import com.biutag.supervision.pojo.entity.NegativeTask; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam; -import com.biutag.supervision.pojo.param.NegativeQueryParam; -import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo; -import com.biutag.supervision.pojo.vo.DataPetitionComplaintNegativeVo; import com.biutag.supervision.pojo.vo.DataPetitionComplaintVo; import com.biutag.supervision.pojo.vo.ExportGabxfVo; import com.biutag.supervision.service.DataPetitionComplaintService; @@ -133,10 +131,6 @@ public class DataPetitionComplaintController { data.setDepartId(departs.get(0).getId()); } } - - - - } } @@ -300,7 +294,12 @@ public class DataPetitionComplaintController { dataPetitionComplaint.setProblemSourcesCode(ProblemSourcesEnum.GABXF.getValue()); dataPetitionComplaint.setCreateTime(LocalDateTime.now()); dataPetitionComplaint.setUpdateTime(LocalDateTime.now()); - dataPetitionComplaint.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue()); + DataPetitionComplaint obj = dataPetitionComplaintService.getOne(new LambdaQueryWrapper().eq(DataPetitionComplaint::getOriginId,item.getOriginId())); + if(ObjectUtil.isNotEmpty(obj)){ + dataPetitionComplaint.setDistributionState(obj.getDistributionState()); + }else{ + dataPetitionComplaint.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue()); + } //信访形式 if (StringUtil.isNotEmpty(item.getPetitionType())) { dataPetitionComplaint.setChannelForFilingComplaints(item.getPetitionType()); diff --git a/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java b/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java index a288134..f0fb8b4 100644 --- a/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java +++ b/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java @@ -22,7 +22,6 @@ import com.biutag.supervision.pojo.vo.VideoInspectionVo; import com.biutag.supervision.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java index 0c42013..e9971ed 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java @@ -1,19 +1,15 @@ package com.biutag.supervision.controller.datav; import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.constants.enums.ProblemSourcesEnum; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.common.PieItem; import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.NegativeBlame; -import com.biutag.supervision.pojo.entity.NegativeProblemRelation; import com.biutag.supervision.pojo.entity.News; import com.biutag.supervision.pojo.vo.AuditOverview; -import com.biutag.supervision.pojo.vo.NewsVo; import com.biutag.supervision.service.NegativeBlameService; -import com.biutag.supervision.service.NegativeProblemRelationService; import com.biutag.supervision.service.NegativeService; import com.biutag.supervision.service.NewsService; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java index 7b38492..d735152 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -8,23 +8,22 @@ import com.biutag.supervision.mapper.DataCaseVerifMapper; import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.DataCaseVerif; +import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.vo.CaseVerificationCountVo; import com.biutag.supervision.pojo.vo.CaseVerificationMapVo; import com.biutag.supervision.pojo.vo.EchartsVo; import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo; -import com.biutag.supervision.service.CaseVerificationService; -import com.biutag.supervision.service.DataCaseVerifService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; 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.Arrays; import java.util.Date; import java.util.List; @@ -134,8 +133,12 @@ public class DataVCaseVerifController { endTime = DateUtil.endOfDay(endTime); // "IFNULL( ROUND( COUNT( DISTINCT IF(ng.checkStatus IN (1, 2), ng.id, NULL) ) / count(DISTINCT ng.id)*100, 1 ), 0 ) AS rate " CaseVerificationCountVo overview = negativeMapper.getAllCaseVerificationCount(beginTime, endTime); + List list = Arrays.asList( A12389.getValue(),SLDJB.getValue(), ZDDJB.getValue(), SJJB.getValue()); + long confirmed = negativeMapper.selectCount(new LambdaQueryWrapper().in(Negative::getProblemSourcesCode,list).between(Negative::getCrtTime,beginTime,endTime)); + long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,endTime)); overview.setTotal((int) total); + overview.setConfirmed((int) confirmed); // overview.setRate((double) ((overview.getConfirmed() / total * 100) )); overview.setRate(NumberUtil.div((Number) (overview.getConfirmed() * 100),total ).doubleValue()); JSONObject res = new JSONObject().fluentPut("overview", overview); diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java index bd42c6e..8f509d8 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.constants.enums.ProblemSourcesEnum; +import com.biutag.supervision.mapper.MailMapper; import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.mapper.SupDepartMapper; import com.biutag.supervision.pojo.Result; @@ -14,12 +15,10 @@ import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.DataMailService; import com.biutag.supervision.service.NegativeService; -import com.gbase.jdbc.log.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,6 +50,8 @@ public class DataVGlobalController { private final NegativeService negativeService; private final SupDepartMapper supDepartMapper; + + private final MailMapper mailMapper; //region 左边 /** @@ -85,6 +86,7 @@ public class DataVGlobalController { @GetMapping("/getBusinessRate") public Result getBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); // 业务类型占比 List ywzblist = negativeMapper.selectBusinessRate(beginTime, endTime); JSONObject res = new JSONObject().fluentPut("ywzblist", ywzblist); @@ -113,7 +115,8 @@ public class DataVGlobalController { MailOverviewVo vo = dataMailService.mailCount(beginTime, endTime); // 局长信箱 - long mailboxNumber = negativeService.count(new LambdaQueryWrapper().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue())); +// long mailboxNumber = negativeService.count(new LambdaQueryWrapper().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue())); + long mailboxNumber = mailMapper.selectMailDataCount(beginTime,endTime); overview.setMailboxNumber(mailboxNumber); overview.setComplaintPro(vo.getCountryMail() + vo.getPoliceMail() + vo.getNumberMail()); JSONObject data = new JSONObject().fluentPut("overview", overview); @@ -132,17 +135,18 @@ public class DataVGlobalController { // @Cacheable(cacheNames = "Supervision:Screen:GlobalMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()") public Result getGlobalMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + Date bigEndTime = DateUtil.endOfDay(endTime); // 地图数据 List mapIconVos = new ArrayList<>(); List list = supDepartMapper.selectList(new LambdaQueryWrapper().eq(SupDepart::getStatisticsGroupId,"3")); list.forEach((s)->{ Integer departId =Integer.valueOf(s.getId()); GlobalMapIconVo vos=new GlobalMapIconVo(); - GlobalOverViewVo overview = negativeMapper.getSuoOneAllGlobalCount(departId, beginTime, endTime); - MailOverviewVo vo = dataMailService.mailCount(departId,beginTime, endTime); + GlobalOverViewVo overview = negativeMapper.getSuoOneAllGlobalCount(departId, beginTime, bigEndTime); + MailOverviewVo vo = dataMailService.mailCount(departId,beginTime, bigEndTime); // 局长信箱 long mailboxNumber = negativeService.count(new LambdaQueryWrapper() - .between(Negative::getCrtTime, beginTime, endTime) + .between(Negative::getCrtTime, beginTime, bigEndTime) .eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()) .eq(Negative::getSecondInvolveDepartId,departId) ); @@ -168,6 +172,7 @@ public class DataVGlobalController { @Operation(summary = "数据大屏问题趋势统计") @GetMapping("/getGlobalTrend") public Result getGlobalRecentlyTrendByMonth(@RequestParam Integer year) { + List GlobalRecentlyTrendList = negativeMapper.getGlobalRecentlyTrendByMonth(year.toString()); JSONObject jsonObject = new JSONObject().fluentPut("globalRecentlyTrendList", GlobalRecentlyTrendList); return Result.success(jsonObject); @@ -210,6 +215,7 @@ public class DataVGlobalController { @GetMapping("/getProblemBusinessRate") public Result getProblemBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); // 问题类型占比 List wtlxlist = negativeMapper.selectProblemRate(beginTime, endTime); JSONObject res = new JSONObject().fluentPut("wtlxlist", wtlxlist); diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java index c5ce28f..9efe3c2 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java @@ -1,16 +1,13 @@ package com.biutag.supervision.controller.datav; -import cn.hutool.core.date.DateTime; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.SupDictData; import com.biutag.supervision.pojo.vo.DistributionVo; -import com.biutag.supervision.service.DataVJwpyService; import com.biutag.supervision.service.SupDictDataService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java index 6a3184c..5bc35c9 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java @@ -14,7 +14,6 @@ import com.biutag.supervision.service.DataMailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -60,6 +59,9 @@ public class DataVMailViewController { MailFirstAndRepeatOverviewVo fxjsFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 3,codes); MailFirstAndRepeatOverviewVo bwzdFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 4,codes); + //未知数据 + int nullNumber = dataPetitionComplaintMapper.getNullObjectData(beginTime, endTime, codes); + fxjsFirstAndRepeatOverview.setFirstMail(fxjsFirstAndRepeatOverview.getFirstMail() + nullNumber); // 初访重访分类数据排行 List fxsjFirstRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.FIRST_MAIL.getId(),codes); // 1 List fxsjRepeatRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.REPEAT_MAIL.getId(),codes); // 2 @@ -76,6 +78,7 @@ public class DataVMailViewController { .fluentPut("fxsjLeaderViewRankList", fxsjLeaderViewRankList) .fluentPut("bwzdFirstRankList", bwzdFirstRankList) .fluentPut("bwzdRepeatRankList", bwzdRepeatRankList) + .fluentPut("nullNumber",nullNumber) .fluentPut("bwzdLeaderViewRankList", bwzdLeaderViewRankList); return Result.success(data); } diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java index b71851f..f86491b 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -4,13 +4,11 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.biutag.supervision.constants.enums.RpcApplyTypeEnum; import com.biutag.supervision.mapper.RpcApplyMapper; import com.biutag.supervision.mapper.RpcInfringerResultMapper; import com.biutag.supervision.mapper.SupDepartMapper; -import com.biutag.supervision.mapper.SupDictDataMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.common.PieItem; import com.biutag.supervision.pojo.entity.RpcApply; @@ -20,15 +18,12 @@ import com.biutag.supervision.pojo.entity.SupDictData; import com.biutag.supervision.pojo.model.DataRightsComfortModel; import com.biutag.supervision.pojo.vo.ComfortMapIconVo; import com.biutag.supervision.pojo.vo.EchartsVo; -import com.biutag.supervision.pojo.vo.MailMapIconVo; import com.biutag.supervision.service.DataRightsComfortService; import com.biutag.supervision.service.RpcApplyService; -import com.biutag.supervision.service.RpcInfringerResultService; import com.biutag.supervision.service.SupDictDataService; import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; @@ -93,13 +88,36 @@ public class DataVRightsComfortController { result.setHitPersonNumber(initialListSize - hitPersonNumber +nums); } - Map> collect = list.stream() - .filter(s-> StrUtil.isNotEmpty(s.getInfringerHandle()) ) - .collect(Collectors.groupingBy(RpcApply::getInfringerHandle)); - // 打处情况 - result.setPunishmentSituation(collect.keySet().stream().map(name -> { - return new PieItem(name, collect.get(name).size()); + List rpcInfringerResults = rpcInfringerResultMapper.selectDataByTime(beginTime, finalEndTime); + Map> collect = rpcInfringerResults.stream() + .filter(s-> StrUtil.isNotEmpty(s.getDefendHandleWayName()) ) + .collect(Collectors.groupingBy(RpcInfringerResult::getDefendHandleWayName)); + + result.setPunishmentSituation( collect.keySet().stream().map(name->{ + long size = collect.get(name).size(); + long number = collect.get(name).stream() + .filter(s -> s.getTortName().contains(",")).toList().size(); + // 筛选出包含逗号的名称 + long numData = collect.get(name).stream() + .filter(s -> s.getTortName().contains(",")) + .mapToLong(s -> s.getTortName().split(",").length) // 拆分每个名称并计算拆分后的数组长度 + .sum();// 计算所有拆分后数组长度的总和 + if(tortNames.stream().noneMatch(s -> s.contains(","))){ + return new PieItem(name, (int) size); + }else{ + return new PieItem(name, (int) (size - number +numData)); + } }).toList()); + + + +// Map> collect = list.stream() +// .filter(s-> StrUtil.isNotEmpty(s.getInfringerHandle()) ) +// .collect(Collectors.groupingBy(RpcApply::getInfringerHandle)); +// // 打处情况 +// result.setPunishmentSituation(collect.keySet().stream().map(name -> { +// return new PieItem(name, collect.get(name).size()); +// }).toList()); }), CompletableFutureUtil.runSyncObject(() -> { // 抚慰人数 diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java index 2837739..091e37f 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java @@ -1,7 +1,6 @@ package com.biutag.supervision.controller.datav; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ArrayUtil; import com.alibaba.fastjson.JSONObject; import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.mapper.WvpDeviceChannelMapper; @@ -14,7 +13,6 @@ import com.biutag.supervision.pojo.vo.VideoSuperviseMapIconVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -106,6 +104,7 @@ public class DataVVideoSuperviseController { @GetMapping("/getAllVideoSuperviseCount") public Result getAllVideoSuperviseCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + endTime = DateUtil.endOfDay(endTime); // 获取视频督察中央数据 VideoSuperviseCountVo overview = negativeMapper.getAllVideoSuperviseCount(beginTime, endTime); JSONObject data = new JSONObject().fluentPut("overview", overview); @@ -159,6 +158,8 @@ public class DataVVideoSuperviseController { @GetMapping("/getVideoSuperviseProblemTypeRate") public Result getVideoSuperviseProblemTypeRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + + endTime =DateUtil.endOfDay(endTime); List videoSuperviseProblemTypeRate = negativeMapper.getVideoSuperviseProblemTypeRate(beginTime, endTime); JSONObject jsonObject = new JSONObject().fluentPut("videoSuperviseProblemTypeRate", videoSuperviseProblemTypeRate); return Result.success(jsonObject); diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java new file mode 100644 index 0000000..fa2b297 --- /dev/null +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java @@ -0,0 +1,101 @@ +package com.biutag.supervision.controller.mobileSupervision; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.dto.SamplingPoliceDto; +import com.biutag.supervision.pojo.param.SamplingQueryParam; +import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo; +import com.biutag.supervision.pojo.vo.PoliceVo; +import com.biutag.supervision.pojo.vo.SamplingVo; +import com.biutag.supervision.service.SamplingService; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.net.URLEncoder; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +@RequestMapping("sampling") +@RequiredArgsConstructor +@RestController +public class SamplingController { + + private final SamplingService samplingService; + + /** + * 分页查询 + * */ + @GetMapping + public Result> list(SamplingQueryParam param) { + return Result.success(samplingService.page(param)); + } + + /** + * 添加或者修改 + * */ + @PostMapping + public Result addOrUpdata(@RequestBody SamplingVo samplingVo){ + if(samplingService.addOrUpdata(samplingVo)){ + return Result.success(); + }else{ + return Result.failed(5000,"操作失败"); + } + } + + /** + * 删除数据 + * */ + @DeleteMapping("{id}") + public Result delData(@PathVariable String id){ + if(samplingService.delDataById(id)){ + return Result.success(); + }else{ + return Result.failed(5000,"操作失败"); + } + } + /** + *获取随机 + * */ + @PostMapping("/postSamplingPolice") + public Result> postSamplingPolice(@RequestBody SamplingVo vo){ + List list = samplingService.getSamplingPolice(vo); + return Result.success(list); + } + + /** + * 获取详情 + * */ + @GetMapping("{id}") + public Result getDetail(@PathVariable String id){ + SamplingVo samplingVo=samplingService.getDetail(id); + return Result.success(samplingVo); + } + + /** + *导出抽检人员数据 + * */ + @GetMapping("export/samplingPoling") + public void exportBySampling(SamplingVo vo, HttpServletResponse response) throws IOException { + AtomicInteger i = new AtomicInteger(1); + if(StrUtil.isNotBlank(vo.getOrgStr())){ + vo.setOrgIds(List.of(vo.getOrgStr().split(","))); + } + List data = samplingService.getSamplingPolice(vo); + List list = data.stream().map(item -> { + SamplingPoliceDto exportGabVo = new SamplingPoliceDto(); + BeanUtil.copyProperties(item, exportGabVo); + return exportGabVo; + }).toList(); + String excelName = StrUtil.isNotBlank( vo.getSamplingName())?vo.getSamplingName():"人员抽检规则"; + String headerValue = "attachment; filename=\"" + URLEncoder.encode(excelName+".xlsx", "UTF-8") + "\""; + response.setHeader("Content-Disposition", headerValue); + response.setContentType("application/octet-stream"); + EasyExcel.write(response.getOutputStream(), SamplingPoliceDto.class).inMemory(Boolean.TRUE).sheet(excelName+".xlsx").doWrite(list); + + } +} diff --git a/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java b/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java index 95d52f7..76942a4 100644 --- a/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java @@ -4,14 +4,11 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.RpcApplySupervise; -import com.biutag.supervision.pojo.param.RpcApplyQueryParam; import com.biutag.supervision.pojo.param.RpcApplySupervisionQueryParam; import com.biutag.supervision.pojo.vo.RpcApplyVo; import com.biutag.supervision.pojo.vo.RpcSuperviseVo; -import com.biutag.supervision.service.RpcApplyService; import com.biutag.supervision.service.RpcApplySuperviseService; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -43,6 +40,14 @@ public class SuperviseController { return Result.failed("没有找到相关的数据"); } } + + //上报数据 + @PostMapping("/reportedData") + public Result reportedData(@RequestBody RpcSuperviseVo vo){ + rpcApplySuperviseService.upSuperviseData(vo); + return Result.success(); + } + /** * 不属实 * */ diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java index ca278ed..a4860fb 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java @@ -16,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java index af11dce..1477c44 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.constants.enums.ProblemSourcesEnum; import com.biutag.supervision.mapper.NegativeMapper; -import com.biutag.supervision.mapper.NegativeProblemRelationMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.vo.*; @@ -13,7 +12,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.*; -import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.*; - /** * @Auther: sh * @Date: 2024/12/4 16:30 diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java index 674f808..9cd5698 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java @@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java index 1c818c8..49cbc76 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java @@ -8,23 +8,19 @@ import com.biutag.supervision.constants.enums.RpcApplyTypeEnum; import com.biutag.supervision.mapper.CountyStreetDeptMapper; import com.biutag.supervision.mapper.RpcApplyMapper; import com.biutag.supervision.mapper.RpcInfringerResultMapper; -import com.biutag.supervision.mapper.SupDepartMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.common.BarItem; import com.biutag.supervision.pojo.dto.common.PieItem; import com.biutag.supervision.pojo.entity.CountyStreetDept; import com.biutag.supervision.pojo.entity.RpcApply; -import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.SupDictData; import com.biutag.supervision.pojo.vo.ComfortCountVO; import com.biutag.supervision.pojo.vo.ComfortMapIconVo; import com.biutag.supervision.pojo.vo.EchartsVo; import com.biutag.supervision.service.DataRightsComfortService; import com.biutag.supervision.service.RpcApplyService; -import com.biutag.supervision.service.SupDepartService; import com.biutag.supervision.service.SupDictDataService; import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil; -import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,8 +33,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.*; import java.util.stream.Collectors; -import static com.biutag.supervision.constants.enums.DepartGroupEnum.COUNTY_CITY_BUREAUS; - /** * @Auther: sh * @Date: 2024/12/24 17:50 diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java index e79c4fa..c59833e 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java @@ -2,7 +2,6 @@ package com.biutag.supervision.controller.subdatav; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervision.constants.enums.InspectCaseEnum; @@ -16,7 +15,6 @@ import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.NegativeBlame; import com.biutag.supervision.pojo.entity.News; import com.biutag.supervision.pojo.vo.*; -import com.biutag.supervision.service.CountyStreetDeptService; import com.biutag.supervision.service.NegativeBlameService; import com.biutag.supervision.service.NewsService; import com.biutag.supervision.service.SubOneSupervisionNotifyService; @@ -25,7 +23,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java index 3d58883..9a14c97 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java @@ -12,7 +12,6 @@ import com.biutag.supervision.service.SubOneVideoSuperviseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.Cacheable; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/biutag/supervision/controller/system/DepartController.java b/src/main/java/com/biutag/supervision/controller/system/DepartController.java index 5a27b1a..f7d1966 100644 --- a/src/main/java/com/biutag/supervision/controller/system/DepartController.java +++ b/src/main/java/com/biutag/supervision/controller/system/DepartController.java @@ -21,7 +21,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java index f393867..3075d88 100644 --- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java +++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java @@ -1,7 +1,6 @@ package com.biutag.supervision.controller.work; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,25 +10,20 @@ import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.ConfinementDto; import com.biutag.supervision.pojo.entity.Confinement; import com.biutag.supervision.pojo.entity.SupDepart; -import com.biutag.supervision.pojo.model.PoliceModel; import com.biutag.supervision.pojo.param.ConfinementFile; import com.biutag.supervision.pojo.param.ConfinementQueryParam; -import com.biutag.supervision.pojo.param.PoliceQueryParam; import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.ConfinementFileService; import com.biutag.supervision.service.ConfinementService; import com.biutag.supervision.util.CommonUtil; import jakarta.servlet.http.HttpServletResponse; -import jdk.jfr.TransitionFrom; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import java.beans.Transient; import java.io.IOException; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java index 6824c8a..d876119 100644 --- a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java +++ b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java @@ -1,6 +1,5 @@ package com.biutag.supervision.controller.work; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java index 43a5a0e..56dcbef 100644 --- a/src/main/java/com/biutag/supervision/job/Job.java +++ b/src/main/java/com/biutag/supervision/job/Job.java @@ -149,7 +149,9 @@ public class Job { } } - + if(StrUtil.isNotBlank(ajjbxx.getAjmc())){ + rpcApply.setCaseName(ajjbxx.getAjmc()); + } //获取单位进行处理 if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){ @@ -201,7 +203,13 @@ public class Job { rpcApplyPerson.setIdCode(item.getGmsfhm()); //受到侵权形式 // rpcApplyPerson.setFormsOfTort(item.getShxsmc()); + rpcApplyPerson.setEmpName(item.getXm()); + if(StrUtil.isNotEmpty(item.getXbmc())){ + rpcApplyPerson.setGender( item.getXbmc().split("性")[0]); + } + SupPolice policeData = policeService.getByIdCode(item.getGmsfhm()); +// rpcApplyPerson.setEmpNo(item.get); if(Objects.nonNull(police)){ rpcApply.setApplicantEmpNo(police.getEmpNo()); } @@ -210,6 +218,7 @@ public class Job { if(ObjectUtil.isNotEmpty(police)){ rpcApplyPerson.setEmpType(police.getJobType()); } + rpcApplyPerson.setEmpNo(rpcApply.getApplicantEmpNo()); //存储受害人信息 rpcApplyPersonService.save(rpcApplyPerson); diff --git a/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java b/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java index d3e4202..755ac50 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java @@ -11,4 +11,4 @@ public interface DataAlarmDispositionInfoMapper extends BaseMapper queryPage(@Param("page") Page page, @Param("ew") QueryWrapper ew); -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java index 8b1842e..affa888 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.entity.DataPetition12337; -import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.vo.DataPetition12337ExportVo; import com.biutag.supervision.pojo.vo.EchartsVo; import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo; diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java index 29b3ec6..b90f1c9 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java @@ -71,6 +71,19 @@ public interface DataPetitionComplaintMapper extends BaseMapper") MailFirstAndRepeatOverviewVo getFirstAndRepeatOverview(Date beginTime, Date endTime, Integer groupId,List codes); + + @Select( "") + int getNullObjectData(Date beginTime, Date endTime,List codes); + @Select( "