From f18d5a75c35774ba77802cd1f0c76706aeda8df7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 23 十一月 2022 14:21:59 +0800
Subject: [PATCH] bug处理
---
ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 2
ycl-platform/src/main/resources/application-pro.yml | 11 ++
ycl-platform/src/main/resources/application-dev.yml | 7 +
ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java | 2
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 5 -
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 198 +++++++++++++++++++++++--------------------------
ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java | 2
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java | 2
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java | 2
9 files changed, 120 insertions(+), 111 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index 8413ef5..e31be53 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/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;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
index cb662cd..b1606c2 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -22,8 +22,6 @@
@ApiModelProperty(value = "褰撲簨浜篿d")
private Long partyInfoId;
- @ApiModelProperty(value = "鏂囦功id")
- private Long writId;
@ApiModelProperty(value = "鍥剧墖id")
private Integer imageResourcesId;
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
index 2b1901f..62854a0 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
+++ b/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;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
index 1fb4384..3a21cd2 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
+++ b/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;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
index 552d177..fc845e3 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
+++ b/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;
/**
* 璇佷欢绫诲瀷鏂囨湰
diff --git a/ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
index 8450c0b..21163df 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
+++ b/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;
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index deea175..b55cfe7 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -74,13 +74,11 @@
public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
- if (arrivalSituationed!=null || arrivalSituationed.getId()!=null){
+ if (arrivalSituationed != null || arrivalSituationed.getId() != null) {
//褰撲簨浜�
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,97 +123,98 @@
, uploadDisposingResultParam.getWritPic()));
iImageResourcesService.updateById(imageResources);
}
+ return iImageResourcesService.updateById(imageResources);
+ } else {
+ //褰撲簨浜�
+ PartyInfo partyInfo = new PartyInfo();
+ if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
+ BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+ partyInfo.setCreateUser(user.getUserId().intValue());
+ partyInfo.setCreateTime(LocalDateTime.now());
+ iPartyInfoService.save(partyInfo);
+ }
+ //璋冩煡鍙栬瘉
+ 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")));
+ iInvestigationService.save(investigation);
+ //鍒拌揪
+ 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")));
+ iArrivalSituationService.save(arrivalSituation);
+ //鏂囦功
+ String handType = "02";
+ 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()));
+ iImageResourcesService.save(imageResources);
+ 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")));
+ iWritService.save(writ);
+ imageResources.setUrl(StringUtils
+ .joinWith(",", uploadDisposingResultParam.getPic()
+ , uploadDisposingResultParam.getSituationPic()
+ , uploadDisposingResultParam.getOriginalPic()
+ , uploadDisposingResultParam.getOtherPic()
+ , uploadDisposingResultParam.getRectifiedPic()
+ , uploadDisposingResultParam.getWritPic()));
+ iImageResourcesService.updateById(imageResources);
+ }
+
+ baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
+ String stepName = StepName.CHECK.getName();
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ disposeRecord.setState(0);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecord.setCreateUser(user.getUserId());
+ disposeRecord.setStepName(stepName);
+ disposeRecord.setStartTime(LocalDateTime.now());
+
+ //缁撴潫涓婁紶澶勭疆娴佺▼
+ QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
+ qureyDispatch.eq("name", StepName.DISPOSE.getName());
+ WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
+
+ UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
+
+ DisposeRecord updateRecord = new DisposeRecord();
+ updateRecord.setState(1);
+ updateRecord.setEndTime(LocalDateTime.now());
+ updateRecord.setHandlerId(disposeRecord.getCreateUser());
+ updateRecord.setResult(uploadDisposingResultParam.getDescription());
+ baseMapper.update(updateRecord, updateWrapper);
+
+ QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
+ stepQurey.eq("name", disposeRecord.getStepName());
+ WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
+ if (workflowConfigStep == null) {
+ throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
+ }
+ //璁剧疆娴佺▼鐜妭鏁版嵁
+ disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
+ disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
+ return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
-
- //褰撲簨浜�
- PartyInfo partyInfo = new PartyInfo();
- if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
- BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
- partyInfo.setCreateUser(user.getUserId().intValue());
- partyInfo.setCreateTime(LocalDateTime.now());
- iPartyInfoService.save(partyInfo);
- }
- //璋冩煡鍙栬瘉
- 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")));
- iInvestigationService.save(investigation);
- //鍒拌揪
- 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")));
- iArrivalSituationService.save(arrivalSituation);
- //鏂囦功
- String handType = "02";
- 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()));
- iImageResourcesService.save(imageResources);
- 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")));
- iWritService.save(writ);
- imageResources.setUrl(StringUtils
- .joinWith(",", uploadDisposingResultParam.getPic()
- , uploadDisposingResultParam.getSituationPic()
- , uploadDisposingResultParam.getOriginalPic()
- , uploadDisposingResultParam.getOtherPic()
- , uploadDisposingResultParam.getRectifiedPic()
- , uploadDisposingResultParam.getWritPic()));
- iImageResourcesService.updateById(imageResources);
- }
-
- baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
- String stepName = StepName.CHECK.getName();
- DisposeRecord disposeRecord = new DisposeRecord();
- disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
- disposeRecord.setState(0);
- disposeRecord.setCreateTime(LocalDateTime.now());
- disposeRecord.setCreateUser(user.getUserId());
- disposeRecord.setStepName(stepName);
- disposeRecord.setStartTime(LocalDateTime.now());
-
- //缁撴潫涓婁紶澶勭疆娴佺▼
- QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
- qureyDispatch.eq("name", StepName.DISPOSE.getName());
- WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
-
- UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
-
- DisposeRecord updateRecord = new DisposeRecord();
- updateRecord.setState(1);
- updateRecord.setEndTime(LocalDateTime.now());
- updateRecord.setHandlerId(disposeRecord.getCreateUser());
- updateRecord.setResult(uploadDisposingResultParam.getDescription());
- baseMapper.update(updateRecord, updateWrapper);
-
- QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
- stepQurey.eq("name", disposeRecord.getStepName());
- WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
- if (workflowConfigStep == null) {
- throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
- }
- //璁剧疆娴佺▼鐜妭鏁版嵁
- disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
- disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
- return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
}
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index d6b0744..cef9a78 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/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
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/application-pro.yml b/ycl-platform/src/main/resources/application-pro.yml
index 1221ace..e4e4bec 100644
--- a/ycl-platform/src/main/resources/application-pro.yml
+++ b/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
\ No newline at end of file
--
Gitblit v1.8.0