ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -3,11 +3,9 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonResult; import com.ycl.entity.cockpitManage.TeamConstruction; import com.ycl.entity.cockpitManage.TeamIndex; import com.ycl.entity.video.VideoPoint; import com.ycl.service.cockpitManage.ITeamConstructionService; import com.ycl.service.video.impl.IVideoPointService; import com.ycl.util.CheckApiUtil; @@ -15,20 +13,17 @@ import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO; import com.ycl.vo.equipment.VideoPointVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; 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 javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -22,8 +22,6 @@ @ApiModelProperty(value = "当事人id") private Long partyInfoId; @ApiModelProperty(value = "文书id") private Long writId; @ApiModelProperty(value = "图片id") private Integer imageResourcesId; ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -44,6 +45,7 @@ */ @TableField("arrival_time") @ApiModelProperty(value = "到达时间") @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime arrivalTime; /** ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -59,6 +60,7 @@ */ @TableField("investigation_time") @ApiModelProperty(value = "时间") @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime investigationTime; /** ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -119,6 +120,7 @@ */ @TableField("create_time") @ApiModelProperty(value = "创建时间") @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 证件类型文本 ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -59,6 +60,7 @@ * 创建时间 */ @TableField("create_time") @JsonFormat(timezone = "GMT", pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime;
@@ -79,8 +79,6 @@ PartyInfo partyInfo = new PartyInfo(); if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) { BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo); partyInfo.setCreateUser(user.getUserId().intValue()); partyInfo.setCreateTime(LocalDateTime.now()); partyInfo.setId(uploadDisposingResultParam.getPartyInfoId()); iPartyInfoService.updateById(partyInfo); } @@ -88,8 +86,6 @@ Investigation investigation = new Investigation(); BeanUtils.copyProperties(uploadDisposingResultParam, investigation); investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId()); investigation.setCreateTime(LocalDateTime.now()); investigation.setCreateUser(user.getUserId()); investigation.setPartyId(partyInfo.getId()); investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); investigation.setId(uploadDisposingResultParam.getInvestigationId()); @@ -98,8 +94,6 @@ ArrivalSituation arrivalSituation = new ArrivalSituation(); BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation); arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId()); arrivalSituation.setCreateTime(LocalDateTime.now()); arrivalSituation.setCreateUser(user.getUserId()); arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId()); iArrivalSituationService.updateById(arrivalSituation); @@ -108,22 +102,17 @@ ImageResources imageResources = new ImageResources(); imageResources.setType(handType); imageResources.setBelongToId(uploadDisposingResultParam.getCaseId()); imageResources.setCreateTime(LocalDateTime.now()); imageResources.setCreateUser(user.getUserId()); imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic())); imageResources.setId(uploadDisposingResultParam.getImageResourcesId()); iImageResourcesService.updateById(imageResources); if (uploadDisposingResultParam.getWritCode() == null || uploadDisposingResultParam.getWritType() == null) { if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) { Writ writ = new Writ(); BeanUtils.copyProperties(uploadDisposingResultParam, writ); writ.setBaseCaseId(uploadDisposingResultParam.getCaseId()); writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId()); writ.setCreateTime(LocalDateTime.now()); writ.setCreateUser(user.getUserId()); writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); writ.setBaseCaseId(uploadDisposingResultParam.getCaseId()); iWritService.updateById(writ); imageResources.setUrl(StringUtils .joinWith(",", uploadDisposingResultParam.getPic() @@ -134,8 +123,8 @@ , uploadDisposingResultParam.getWritPic())); iImageResourcesService.updateById(imageResources); } } return iImageResourcesService.updateById(imageResources); } else { //当事人 PartyInfo partyInfo = new PartyInfo(); if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) { @@ -170,7 +159,7 @@ imageResources.setCreateUser(user.getUserId()); imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic())); iImageResourcesService.save(imageResources); if (uploadDisposingResultParam.getWritCode() == null || uploadDisposingResultParam.getWritType() == null) { if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) { Writ writ = new Writ(); BeanUtils.copyProperties(uploadDisposingResultParam, writ); writ.setBaseCaseId(uploadDisposingResultParam.getCaseId()); @@ -228,3 +217,4 @@ return baseMapper.insert(disposeRecord) == 1 ? true : false; } } } ycl-platform/src/main/resources/application-dev.yml
@@ -53,6 +53,7 @@ testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 e-mail: sendHost: smtp.qq.com username: 1723292425@qq.com @@ -64,3 +65,9 @@ sign: sign url: http://localhost:8082/sccg/text/sms_res point: severIpAddress: http://localhost:8082/sccg/text/point username: text password: 123456 sendIp: 192.168.3.137 os: WinPc ycl-platform/src/main/resources/application-pro.yml
@@ -51,3 +51,14 @@ testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 e-mail: sendHost: smtp.qq.com username: 1723292425@qq.com password: qizcitupatzoeeij SMS: ecName: ycl apId: 1 sign: sign url: http://localhost:8082/sccg/text/sms_res
