yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhongwei
haungxing 1 year ago
parent
77717ce336 face537c38
commit
2555918f16
19 changed files with 226 additions and 162 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/entity/EcologyFlowStationEntity.java
  2. 4
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerDeviceVo.java
  3. 3
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitRealVo.java
  4. 6
      hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java
  5. 67
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DefectProcessServiceImpl.java
  6. 8
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java
  7. 8
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java
  8. 2
      hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java
  9. 8
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java
  10. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java
  11. 20
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java
  12. 7
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java
  13. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java
  14. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
  15. 1
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
  16. 1
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java
  17. 24
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
  18. 1
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java
  19. 30
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

2
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/entity/EcologyFlowStationEntity.java
Unescape View File

@ -19,6 +19,8 @@ public class EcologyFlowStationEntity extends TenantEntity {
private String stationName;
private String city;
private Long isOnLine;
private Long isDemonstrate;

4
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AppHydropowerDeviceVo.java
Unescape View File

@ -2,6 +2,7 @@ package com.hnac.hzims.operational.main.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
/**
@ -28,4 +29,7 @@ public class AppHydropowerDeviceVo {
@ApiModelProperty(value = "负荷单位")
private String loadUnit;
@ApiModelProperty(value = "排序")
private Integer ord;
}

3
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitRealVo.java
Unescape View File

@ -61,4 +61,7 @@ public class HydropowerUnitRealVo {
@ApiModelProperty(value = "电流单位")
private String currentUnit;
@ApiModelProperty(value = "排序")
private Integer ord;
}

6
hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java
Unescape View File

@ -29,4 +29,10 @@ public class TicketProcessConstant {
* 日常维护
*/
public static final String MAINTENANCE_KEY = "maintenance";
/**
* 消缺流程
*/
public static final String DEFECT_KEY = "defectDealty";
}

67
hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/DefectProcessServiceImpl.java
Unescape View File

@ -0,0 +1,67 @@
package com.hnac.hzims.middle.processflow.strategy.serviceimpl;
import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
import com.hnac.hzims.middle.processflow.service.ProcessDictService;
import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.operational.defect.feign.IOperDefectClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.DEFECT_KEY;
/**
* 消缺工作流实现类
*
* @Author dfy
* @Version v1.0
* @Serial 1.0
* @Date 2023/3/28 8:47
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class DefectProcessServiceImpl extends ProcessAbstractService {
private final IOperDefectClient defectClient;
private final ProcessDictService processDictService;
/**
* 设置执行那种实现类
*
* @param flowQueue
* @return
*/
@Override
public Boolean isWorkflowProcess(WorkflowQueue flowQueue) {
log.info("是否执行消缺工作流实流程环节操作~~~~,流程ticket: {}", flowQueue);
String dictValue = processDictService.selectDictValueByKey(DEFECT_KEY);
if (dictValue.equals(flowQueue.getProcessDefinitionKey())) {
log.info("已执行消缺工作流程环节操作~~~~");
return true;
}
log.error("未是否执行消缺工作流流程环节操作，请联系管理员~~~~");
return false;
}
/**
* 两票管理业务方法
*
* @param response
*/
@Override
public void calculate(ProcessWorkFlowResponse response) {
R defect = defectClient.saveDefect(response);
if (!defect.isSuccess()) {
throw new ServiceException("消缺工作流程出现异常呢");
}
}
}

8
hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java
Unescape View File

@ -4,7 +4,7 @@ import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
import com.hnac.hzims.middle.processflow.service.ProcessDictService;
import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.ticket.ticketprocess.feign.OperationTicketFeignClient;
import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
@ -28,7 +28,7 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService {
private final OperationTicketFeignClient ticketProcessService;
private final TicketProcessFeignClient ticketProcessService;
@ -36,10 +36,6 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService {
/**
* 设置执行那种实现类
*

8
hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java
Unescape View File

@ -4,6 +4,7 @@ import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
import com.hnac.hzims.middle.processflow.service.ProcessDictService;
import com.hnac.hzims.middle.processflow.strategy.abstracts.ProcessAbstractService;
import com.hnac.hzims.middle.processflow.strategy.entity.WorkflowQueue;
import com.hnac.hzims.ticket.ticketprocess.feign.OperationTicketFeignClient;
import com.hnac.hzims.ticket.ticketprocess.feign.TicketProcessFeignClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -28,7 +29,7 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
private final TicketProcessFeignClient operationTicketService;
private final OperationTicketFeignClient operationTicketFeignClient;
@ -44,7 +45,7 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
*/
@Override
public Boolean isWorkflowProcess(WorkflowQueue flowQueue) {
log.info("是否执行开操作票流程环节操作~~~~,流程flowQueue: {}", flowQueue);
log.info("是否执行操作票流程环节操作~~~~,流程flowQueue: {}", flowQueue);
String dictValue = processDictService.selectDictValueByKey(OPERATION_TICKET_KEY);
if (dictValue.equals(flowQueue.getProcessDefinitionKey())) {
log.info("已执行操作票流程环节操作~~~~");
@ -61,10 +62,9 @@ public class OperationTicketProcessServiceImpl extends ProcessAbstractService {
*/
@Override
public void calculate(ProcessWorkFlowResponse response) {
Boolean pending = operationTicketService.findPending(response);
Boolean pending = operationTicketFeignClient.findPending(response);
if (!pending) {
throw new ServiceException("操作票流程出现异常呢");
}
}
}

2
hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/RealTargetServiceImpl.java
Unescape View File

@ -1186,7 +1186,7 @@ public class RealTargetServiceImpl implements RealTargetService {
*/
private int getPhotovoltaicState(EminfoAndEmParamVo device, Map<String, String> map) {
// 获取开关机监测点实时数据
Double value = this.getSignageValue(device, map, HomePageConstant.PV_JOINT_RELAY);
double value = this.getSignageValue(device, map, HomePageConstant.PV_JOINT_RELAY);
// 开机状态
if (Math.abs(value) <= 0) {
return 0;

8
hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java
Unescape View File

@ -54,8 +54,8 @@ public class EcologyController extends BladeController {
@PostMapping("/station_top")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "站点数据及达标率排行", notes = "站点数据及达标率排行")
public R station_top() {
return R.data(stationService.station_top());
public R station_top(@RequestParam String city) {
return R.data(stationService.station_top(city));
}
/**
@ -65,8 +65,8 @@ public class EcologyController extends BladeController {
@PostMapping("/trend_chart")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "指标趋势图", notes = "指标趋势图")
public R trend_chart(@RequestParam String type) {
return R.data(stationService.trend_chart(type));
public R trend_chart(@RequestParam String city,@RequestParam String type) {
return R.data(stationService.trend_chart(city,type));
}

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java
Unescape View File

@ -14,12 +14,12 @@ import java.util.List;
*/
public interface EcologyFlowStationService extends BaseService<EcologyFlowStationEntity> {
EcologFlowStationVo station_top();
EcologFlowStationVo station_top(String city);
Boolean generate(Long mon,String year);
List<TrendChartVo> trend_chart(String type);
List<TrendChartVo> trend_chart(String city,String type);
List<StationVo> station();
}

20
hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java
Unescape View File

@ -98,8 +98,9 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
* @return
*/
@Override
public EcologFlowStationVo station_top() {
List<EcologyFlowStationEntity> stations = this.list();
public EcologFlowStationVo station_top(String city) {
List<EcologyFlowStationEntity> stations = this.list(Wrappers.<EcologyFlowStationEntity>lambdaQuery()
.eq(EcologyFlowStationEntity::getCity,city));
if(CollectionUtil.isEmpty(stations)){
return new EcologFlowStationVo();
}
@ -110,8 +111,9 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
station.setTimely(BigDecimal.valueOf((int) stations.stream().filter(o -> o.getIsTimely().equals(1L)).count() / (double) stations.size() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
station.setCount(stations.size());
List<EcologyFlowDataEntity> datas = dataService.list(Wrappers.<EcologyFlowDataEntity>lambdaQuery().
like(EcologyFlowDataEntity::getMon, DateUtil.format(new Date(),"yyyy-MM")));
List<EcologyFlowDataEntity> datas = dataService.list(Wrappers.<EcologyFlowDataEntity>lambdaQuery()
.like(EcologyFlowDataEntity::getMon, DateUtil.format(new Date(),"yyyy-MM"))
.in(EcologyFlowDataEntity::getStationId,stations.stream().map(EcologyFlowStationEntity::getStationId).collect(Collectors.toList())));
if(CollectionUtil.isEmpty(datas)){
return station;
}
@ -132,8 +134,14 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
* @return
*/
@Override
public List<TrendChartVo> trend_chart(String type) {
public List<TrendChartVo> trend_chart(String city,String type) {
List<EcologyFlowStationEntity> stations = this.list(Wrappers.<EcologyFlowStationEntity>lambdaQuery()
.eq(EcologyFlowStationEntity::getCity,city));
if(CollectionUtil.isEmpty(stations)){
return new ArrayList<>();
}
LambdaQueryWrapper<EcologyFlowDataEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.in(EcologyFlowDataEntity::getStationId,stations.stream().map(EcologyFlowStationEntity::getStationId).collect(Collectors.toList()));
if("0".equals(type)){
wrapper.like(EcologyFlowDataEntity::getMon, DateUtil.format(new Date(),"yyyy"));
}
@ -179,7 +187,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
@Override
public List<StationVo> station() {
List<StationEntity> stations = stationService.list(Wrappers.<StationEntity>lambdaQuery()
.in(StationEntity::getCode,Arrays.asList("902400000054","902400052664")));
.in(StationEntity::getCode,Arrays.asList("902400000054","902400052664","902400056791")));
if(CollectionUtil.isEmpty(stations)){
return new ArrayList<>();
}

7
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java
Unescape View File

@ -278,12 +278,9 @@ public class ScheduledCreateTask {
/**
* 水电站-机组实时加载
* @return ReturnT<String>
*/
//@XxlJob(LOAD_HYDROPOWER_UNIT_REAL)
@Scheduled(cron = "0/40 * * * * ? ")
public ReturnT<String> loadHydropowerUnitReal() throws Exception {
String param = "";
@XxlJob(LOAD_HYDROPOWER_UNIT_REAL)
public ReturnT<String> loadHydropowerReal(String param) {
if (Func.isBlank(param)) {
param = DateUtil.format(new Date(), "yyyy-MM");
}

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java
Unescape View File

@ -246,7 +246,7 @@ public class HomeServiceImpl implements HomeService {
double plan = list.stream().mapToDouble(PowerEntity::getPlannedPowerMon).sum();
double pass = list.stream().mapToDouble(power -> Double.parseDouble(power.getDoubleQualifyRate())).sum();
// 装机容量
target.setTaget_one(list.stream().map(PowerEntity::getInstalledCapacity).collect(Collectors.toSet()).stream().mapToDouble(Double::valueOf).sum());
target.setTaget_one(list.get(0).getInstalledCapacity());
// 发电量
target.setTaget_two(list.stream().mapToDouble(PowerEntity::getPowerMon).sum());
if(Math.abs(plan) > 0){
@ -254,7 +254,7 @@ public class HomeServiceImpl implements HomeService {
target.setTaget_three(BigDecimal.valueOf(target.getTaget_two() / plan * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
}
// 双票合格率
target.setTaget_four(BigDecimal.valueOf(pass / list.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
target.setTaget_four(BigDecimal.valueOf(pass / list.size() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
return target;
}

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
Unescape View File

@ -153,6 +153,7 @@ public class HydropowerServiceImpl implements HydropowerService {
HydropowerUnitRealVo real = new HydropowerUnitRealVo();
real.setDeptId(device.getCreateDept());
real.setDeviceCode(device.getEmCode());
real.setOrd(device.getOrd());
real.setDeptName(device.getName());
real.setDeviceName(device.getName());
// 装机容量
@ -1548,12 +1549,13 @@ public class HydropowerServiceImpl implements HydropowerService {
AppHydropowerDeviceVo device = new AppHydropowerDeviceVo();
device.setDeviceCode(real.getDeviceCode());
device.setDeviceName(real.getDeviceName());
device.setOrd(real.getOrd());
device.setState(real.getState());
device.setLoadUnit(Optional.ofNullable(real.getPowerUnit()).orElse("kW"));
device.setCapacity(real.getInstalledCapacity());
device.setLoad(real.getActivePower());
return device;
}).collect(Collectors.toList()));
}).sorted(Comparator.comparing(AppHydropowerDeviceVo::getOrd)).collect(Collectors.toList()));
hydropower.setLoadUnit(hydropower.getDevices().get(0).getLoadUnit());
}
return hydropower;

1
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
Unescape View File

@ -54,6 +54,7 @@ public class OperationTicketController {
operationTicketService.findPending(response);
return true;
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException("操作票待处理:" + e.getMessage());
}
}

1
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java
Unescape View File

@ -113,7 +113,6 @@ public class StandardTicketInfoController extends BladeController {
/**
* 根据月份，区域 获取操作详情数据
*
* @return
*/
@GetMapping("/areaMonthlyWithOperation/{page}/{size}")

24
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
Unescape View File

@ -41,6 +41,7 @@ import org.springblade.system.feign.ISysClient;
import org.springblade.system.user.cache.UserCache;
import org.springblade.system.user.entity.User;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream;
@ -77,7 +78,6 @@ public class OperationTicketServiceImpl implements OperationTicketService {
private final ProcessDictFeignService processDictFeignService;
private final IFlowClient flowClient;
@ -168,9 +168,9 @@ public class OperationTicketServiceImpl implements OperationTicketService {
standardTicketInfoVo = JSONObject.toJavaObject(jsonObject, StandardTicketInfoVo.class);
} catch (Exception e) {
log.error("获取表单出现异常了~~~~");
e.printStackTrace();
throw new IllegalArgumentException(e.getMessage());
}
//1.查询操作票信息
Long id = NumberUtils.toLong(response.getBusinessKey());
StandardTicketInfoEntity standardTicketInfoEntity = standardTicketInfoService.getById(id);
@ -178,6 +178,7 @@ public class OperationTicketServiceImpl implements OperationTicketService {
log.error("获取操作票不存在");
return;
}
//设置id
StandardTicketInfoEntity newStandardTicketInfoEntity = new StandardTicketInfoEntity();
BeanUtils.copyProperties(standardTicketInfoVo, newStandardTicketInfoEntity);
@ -187,6 +188,7 @@ public class OperationTicketServiceImpl implements OperationTicketService {
newStandardTicketInfoEntity.setProcessInstanceId(response.getProcessInstanceId());
standardTicketInfoService.updateById(newStandardTicketInfoEntity);
//更新安全措施
List<StandardTicketMeasureVo> standardTicketMeasureVos = standardTicketInfoVo.getStandardTicketMeasureVos();
if (CollectionUtils.isNotEmpty(standardTicketMeasureVos)) {
@ -198,7 +200,6 @@ public class OperationTicketServiceImpl implements OperationTicketService {
standardTicketMeasureService.updateBatchById(standardTicketMeasureEntities);
}
//推送消息
if (response.getTaskId() != null) {
MessagePushRecordDto message = new MessagePushRecordDto();
@ -238,6 +239,8 @@ public class OperationTicketServiceImpl implements OperationTicketService {
messageClient.sendMessage(message);
}
}
}
@ -249,19 +252,23 @@ public class OperationTicketServiceImpl implements OperationTicketService {
*/
private void saveStandardTicketInfoEntity(StandardTicketInfoEntity newStandardTicketInfoEntity, ProcessWorkFlowResponse response) {
String flowDescription = "";
//如果response.getHandleType() 是0使用户
newStandardTicketInfoEntity.setFlowUserId(response.getUserId());
newStandardTicketInfoEntity.setNextStepOperator(response.getNextStepOperator());
if (response.getNextStepOperator() != null) {
flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat("，待").concat(response.getNextStepOperator()).concat("审批");
}
//如果taskId为空
String taskId = response.getTaskId();
if (StringUtils.isEmpty(taskId)) {
log.info("StringUtils.isBlank(taskId) = " + StringUtils.isBlank(taskId));
if (StringUtils.isBlank(taskId)) {
newStandardTicketInfoEntity.setFlowDescription("结束");
newStandardTicketInfoEntity.setFlowTaskId(" ");
newStandardTicketInfoEntity.setFlowTaskName("结束");
newStandardTicketInfoEntity.setNextStepOperator(" ");
newStandardTicketInfoEntity.setFlowStatus(999);
} else {
//如果response.getHandleType() 是0使用户
newStandardTicketInfoEntity.setFlowUserId(response.getUserId());
newStandardTicketInfoEntity.setNextStepOperator(response.getNextStepOperator());
newStandardTicketInfoEntity.setFlowTaskId(taskId);
newStandardTicketInfoEntity.setFlowTaskName(response.getTaskName());
newStandardTicketInfoEntity.setFlowDescription(flowDescription);
@ -379,8 +386,6 @@ public class OperationTicketServiceImpl implements OperationTicketService {
}
/**
* 新预览
*
@ -421,6 +426,7 @@ public class OperationTicketServiceImpl implements OperationTicketService {
/**
* 将查询的数据转换为map
*
* @param standardTicketInfoVo
* @return
*/

1
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java
Unescape View File

@ -58,6 +58,7 @@ public class TicketProcessController {
ticketProcessService.findPending(response);
return true;
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException("工作票待处理:" + e.getMessage());
}
}

30
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
Unescape View File

@ -276,7 +276,6 @@ public class TicketProcessServiceImpl implements TicketProcessService {
log.error("获取工作票的数据为不存在");
return;
}
try {
//更新工作票
workTicket.setId(workTicketInfo.getId());
//保存流程描述
@ -286,11 +285,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
//工作流ID
workTicket.setProcessInstanceId(response.getProcessInstanceId());
workTicketInfoService.updateById(workTicket);
} catch (Exception e) {
e.printStackTrace();
}
//更新安全措施
try {
List<WorkTicketSafetyMeasureEntity> safetyMeasuresList = workTicketVo.getSafetyMeasuresList();
if (CollectionUtils.isNotEmpty(safetyMeasuresList)) {
log.info("获取安全措施的数据：{}", safetyMeasuresList);
@ -303,12 +298,8 @@ public class TicketProcessServiceImpl implements TicketProcessService {
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
// 第二种 工作票工作任务组
List<WorkTicketContentEntity> workTicketContentDtoList = workTicketVo.getWorkTicketContentDtoList();
try {
if (CollectionUtils.isNotEmpty(workTicketContentDtoList)) {
log.info("获取工作票工作任务组：{}", workTicketContentDtoList);
workTicketContentDtoList.forEach(item -> {
@ -319,14 +310,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
}
});
}
} catch (Exception e) {
e.printStackTrace();
}
// 工作票延期
WorkTicketDelayEntity workTicketDelay = workTicketVo.getWorkTicketDelay();
try {
if (ObjectUtils.isNotEmpty(workTicketDelay) && "延期".equals(workTicket.getInput())) {
WorkTicketDelayEntity workTicketDelayEntity = workTicketDelayService.selectByTicketId(workTicketInfo.getId());
@ -342,14 +328,10 @@ public class TicketProcessServiceImpl implements TicketProcessService {
workTicketDelayService.updateByTicketId(workTicketDelay);
}
}
} catch (Exception e) {
e.printStackTrace();
}
//工作结束
WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish();
try {
log.info("工作结束==============>" + (workTicket.getFlowStatus().intValue()));
if (ObjectUtils.isNotEmpty(workTicketFinish)) {
WorkTicketFinish ticketFinish = workTicketFinishService.selectByTicketId(workTicketInfo.getId());
@ -364,9 +346,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
workTicketFinishService.updateByTicketId(workTicketFinish);
}
}
} catch (Exception e) {
e.printStackTrace();
}
// 工作开始时间和结束时间
// List<WorkTicketOperateTimeEntity> workTicketOperateTimeEntities = workTicketVo.getWorkTicketOperateTimeEntities();
@ -376,7 +356,6 @@ public class TicketProcessServiceImpl implements TicketProcessService {
// }
//工作票负责人变更
WorkTicketPrincipalChangeEntity workTicketPrincipalChange = workTicketVo.getWorkTicketPrincipalChange();
try {
if (ObjectUtils.isNotEmpty(workTicketPrincipalChange) && "转移".equals(workTicket.getInput())) {
log.info("工作票负责人变更： {}", workTicketPrincipalChange);
//原来的负责人
@ -405,13 +384,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
//更新工作票
workTicketInfoService.updateById(workTicket);
}
} catch (Exception e) {
e.printStackTrace();
}
//工作票危险点分析及控制措施票
try {
if (workTicket.getIsHazard()) {
List<TicketInfoDanger> ticketInfoDangers = workTicketVo.getTicketInfoDangers();
if (CollectionUtils.isNotEmpty(ticketInfoDangers)) {
@ -426,9 +401,6 @@ public class TicketProcessServiceImpl implements TicketProcessService {
ticketInfoDangerService.saveBatch(collect);
}
}
} catch (Exception e) {
e.printStackTrace();
}
if (response.getTaskId() != null || response.getUserId() != null) {

Write Preview
Loading…
Cancel
Save