jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
tags/yfai-mes-ext-v1.0
jun 12 months ago
parent 3227ee65ca 496b219fd7
commit ff001be549
8 changed files with 182 additions and 114 deletions
Show Stats Download Patch File Download Diff File

15
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesEquipmentLogDetailService.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.ext.mes.api.busi.report;
import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
/**
* @Description : 设备日志报表
* @Reference :
* @Author : wangjie
* @CreateDate : 2023/02/06 13:42
* @Modify:
**/
public interface IMesEquipmentLogDetailService extends IBaseMesService<MesEquipmentLogDetail> {
}

5
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesWorkCellScanMonitorLogService.java
Unescape Escape View File

@ -1,7 +1,10 @@
package cn.estsh.i3plus.ext.mes.api.busi.report;
import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellScanMonitorLog;
import io.swagger.annotations.ApiOperation;
import java.util.List;
@ -13,7 +16,7 @@ import java.util.List;
* @CreateDate : 2023/02/06 13:42
* @Modify:
**/
public interface IMesWorkCellScanMonitorLogService {
public interface IMesWorkCellScanMonitorLogService extends IBaseMesService<MesWorkCellScanMonitorLog> {
/**
* 查询工位扫描日志合并设备日志报表

202
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
Unescape Escape View File

@ -1,69 +1,69 @@
//package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
//
//import cn.estsh.i3plus.ext.mes.api.base.IMesMediaFileCfgService;
//import cn.estsh.i3plus.ext.mes.apiservice.config.HuaWeiCloudObsConfig;
//import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
//import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
//import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud;
//import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
//import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg;
//import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository;
//import cn.estsh.impp.framework.boot.exception.ImppBusiException;
//import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
//import cn.estsh.impp.framework.boot.fileservice.ImppFileService;
//import cn.estsh.impp.framework.boot.util.ResultBean;
//import com.obs.services.ObsClient;
//import com.obs.services.exception.ObsException;
//import com.obs.services.model.*;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.web.multipart.MultipartFile;
//
//import javax.servlet.http.HttpServletResponse;
//import java.io.File;
//import java.io.FileInputStream;
//import java.io.InputStream;
//import java.io.OutputStream;
//import java.net.URLEncoder;
//import java.util.ArrayList;
//import java.util.List;
//import java.util.UUID;
//
///**
// * @Description: 媒体文件维护
// * @CreateDate 2024/6/6
// * @Author gsz
// */
//@Api("媒体文件维护")
//@RestController
//@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMediaFileCfg")
//public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg> {
// public static final Logger LOGGER = LoggerFactory.getLogger(MesMediaFileCfgController.class);
// @Autowired
// private MesMediaFileCfgRepository mediaFileCfgRepository;
//
// @Autowired
// private ICoreSysFileCloud coreSysFileCloud;
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesMediaFileCfgService;
import cn.estsh.i3plus.ext.mes.apiservice.config.HuaWeiCloudObsConfig;
import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg;
import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.fileservice.ImppFileService;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.obs.services.ObsClient;
import com.obs.services.exception.ObsException;
import com.obs.services.model.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* @Description: 媒体文件维护
* @CreateDate 2024/6/6
* @Author gsz
*/
@Api("媒体文件维护")
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMediaFileCfg")
public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg> {
public static final Logger LOGGER = LoggerFactory.getLogger(MesMediaFileCfgController.class);
@Autowired
private MesMediaFileCfgRepository mediaFileCfgRepository;
@Autowired
private ICoreSysFileCloud coreSysFileCloud;
//
// @Autowired
// HuaWeiCloudObsConfig obsConfig;
//
// @Autowired
// private IMesMediaFileCfgService mediaFileCfgService;
// /**
// * fastDfs客户端
// */
// @Autowired
// private ImppFileService fileService;
// //默认大小
// private static final long FILE_SIZE = 1024 * 1024;
//
@Autowired
private IMesMediaFileCfgService mediaFileCfgService;
/**
* fastDfs客户端
*/
@Autowired
private ImppFileService fileService;
//默认大小
private static final long FILE_SIZE = 1024 * 1024;
// @PostMapping(value = "/obs/upload")
// @ApiOperation(value = "上传媒体文件")
// public ResultBean obsUploadFile(@RequestParam("file") MultipartFile file, MesMediaFileCfg mesMediaFileCfg) {
@ -128,8 +128,8 @@
// }
//
// }
//
//
// @ApiOperation("查看文件")
// @GetMapping("/obs/query-file")
// public ResultBean queryObjectFile(HttpServletResponse response, MesMediaFileCfg mesMediaFileCfg) {
@ -157,7 +157,7 @@
// }
//
// }
//
// @ApiOperation("创建桶")
// @GetMapping("/obs/createMesBucket")
// public ResultBean CreateMesBucket() {
@ -198,7 +198,7 @@
// return ResultBean.success("创建成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
//
// }
//
// @ApiOperation("列举桶")
// @GetMapping("/obs/getObsClient")
// public ResultBean getObsClient() {
@ -217,7 +217,7 @@
// return ResultBean.success("创建成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(buckets);
//
// }
//
// @PostMapping(value = "/media-file/insert")
// @ApiOperation(value = "上传媒体文件")
// public ResultBean insertProduceCtgyPicture(@RequestParam("file") MultipartFile file, MesMediaFileCfg mesMediaFileCfg) {
@ -296,37 +296,37 @@
// }
//
// }
//// @PostMapping(value = "/sys-upload")
//// @ApiOperation(value = "系统导入")
//// public ResultBean insertPartFurnace(@RequestParam("file") MultipartFile file, MesMediaFileCfg mesMediaFileCfg) {
//// try {
//// if (file.isEmpty()) {
//// throw ImppExceptionBuilder.newInstance()
//// .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode())
//// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
//// .setErrorDetail("不允许上传空文件")
//// .build();
//// }
//// SysFile sysFile = fileService.upload(file, CommonEnumUtil.SOFT_TYPE.MES.getValue());
////// MesFile mesFile = fileService.uploadMesFile(file, AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
////
//// //属性验证
//// ValidatorBean.beginValid(mesMediaFileCfg)
//// .notNull("modelNo", mesMediaFileCfg.getFileType());
////
//// MesMediaFileCfg mesMediaFileCfg1 = new MesMediaFileCfg();
//// mesMediaFileCfg1.setFileName(sysFile.getDfsFileName());
//// mesMediaFileCfg1.setFileUrl(sysFile.getFilePath());
//// mesMediaFileCfg1.setFileType(mesMediaFileCfg.getFileType());
//// mediaFileCfgRepository.save(mesMediaFileCfg1);
////
//// return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
//// } catch (ImppBusiException imppException) {
//// LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException);
//// return ResultBean.fail(imppException);
//// } catch (Exception e) {
//// return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
//// }
//// }
// @PostMapping(value = "/sys-upload")
// @ApiOperation(value = "系统导入")
// public ResultBean insertPartFurnace(@RequestParam("file") MultipartFile file, MesMediaFileCfg mesMediaFileCfg) {
// try {
// if (file.isEmpty()) {
// throw ImppExceptionBuilder.newInstance()
// .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode())
// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
// .setErrorDetail("不允许上传空文件")
// .build();
// }
// SysFile sysFile = fileService.upload(file, CommonEnumUtil.SOFT_TYPE.MES.getValue());
//// MesFile mesFile = fileService.uploadMesFile(file, AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
//
//}
// //属性验证
// ValidatorBean.beginValid(mesMediaFileCfg)
// .notNull("modelNo", mesMediaFileCfg.getFileType());
//
// MesMediaFileCfg mesMediaFileCfg1 = new MesMediaFileCfg();
// mesMediaFileCfg1.setFileName(sysFile.getDfsFileName());
// mesMediaFileCfg1.setFileUrl(sysFile.getFilePath());
// mesMediaFileCfg1.setFileType(mesMediaFileCfg.getFileType());
// mediaFileCfgRepository.save(mesMediaFileCfg1);
//
// return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
// } catch (ImppBusiException imppException) {
// LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException);
// return ResultBean.fail(imppException);
// } catch (Exception e) {
// return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
// }
// }
}

22
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesEquipmentLogDetailController.java
Unescape Escape View File

@ -0,0 +1,22 @@
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description :设备日志报表
* @Reference :
* @Author : wangjie
* @CreateDate : 2023/02/06 09:59
* @Modify:
**/
@Api(tags = "设备日志报表")
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentLogDetail")
public class MesEquipmentLogDetailController extends BaseMesController<MesEquipmentLogDetail> {
}

13
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
Unescape Escape View File

@ -1,11 +1,12 @@
package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.impp.framework.base.controller.BaseController;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellScanMonitorLog;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -26,15 +27,15 @@ import java.util.List;
* @CreateDate : 2023/02/06 09:59
* @Modify:
**/
@RestController
@RequestMapping(CommonConstWords.BASE_URL_MES)
@Api(tags = "工位扫描日志合并设备日志报表")
public class MesWorkCellScanMonitorLogController extends BaseController {
@RestController
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellScanMonitorLog")
public class MesWorkCellScanMonitorLogController extends BaseMesController<MesWorkCellScanMonitorLog> {
@Autowired
private IMesWorkCellScanMonitorLogService workCellScanMonitorLogService;
@GetMapping(value = "/ext/work-cell-scan-monitor-log/report/query")
@GetMapping(value = "/monitor-and-logdetail/report/query")
@ApiOperation(value = "查询工位扫描日志合并设备日志报表")
public ResultBean queryWorkCellScanMonitorLogList(MesWorkCellScanMonitorConditionModel conditionModel) {
try {

26
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
Unescape Escape View File

@ -0,0 +1,26 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesEquipmentLogDetailService;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
import org.springframework.stereotype.Service;
@Service
public class MesEquipmentLogDetailService extends BaseMesService<MesEquipmentLogDetail> implements IMesEquipmentLogDetailService {
@Override
protected void setPackQueryBean(MesEquipmentLogDetail bean, DdlPackBean packBean) {
DdlPreparedPack.getNumEqualPack(bean.getEquipId(), MesExtConstWords.EQUIP_ID, packBean);
DdlPreparedPack.getNumEqualPack(bean.getVariableType(), MesExtConstWords.VARIABLE_TYPE, packBean);
DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
}
}

9
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
@ -31,7 +32,7 @@ import java.util.List;
import java.util.stream.Collectors;
@Service
public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogService {
public class MesWorkCellMonitorLogService extends BaseMesService<MesWorkCellScanMonitorLog> implements IMesWorkCellScanMonitorLogService {
@Autowired
private MesWcEquipmentRepository wcEquipmentRepository;
@ -73,7 +74,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
if (StringUtils.isEmpty(conditionModel.getLimit())) MesException.throwBusiException("请输入查询数据量后进行查询!");
if (StringUtils.isEmpty(conditionModel.getCreateDatetimeStart()) || StringUtils.isEmpty(conditionModel.getCreateDatetimeEnd())) MesException.throwBusiException("请输入时间查询条件后进行查询!");
if (StringUtils.isEmpty(conditionModel.getCreateDateTimeStart()) || StringUtils.isEmpty(conditionModel.getCreateDateTimeEnd())) MesException.throwBusiException("请输入时间查询条件后进行查询!");
if (StringUtils.isEmpty(conditionModel.getWorkCellCode()) && StringUtils.isEmpty(conditionModel.getEquipmentCode())) MesException.throwBusiException("请输入工位代码或者设备代码后进行查询!");
@ -156,7 +157,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
DdlPreparedPack.getNumEqualPack(conditionModel.getMouldRecordId(), MesExtConstWords.MOULD_RECORD_ID, packBean);
DdlPreparedPack.getNumEqualPack(conditionModel.getMessageType(), MesExtConstWords.MESSAGE_TYPE, packBean);
DdlPreparedPack.getInPackList(conditionModel.getLogTypeList(), MesExtConstWords.LOG_TYPE, packBean);
DdlPreparedPack.timeBuilder(conditionModel.getCreateDatetimeStart(), conditionModel.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
DdlPreparedPack.timeBuilder(conditionModel.getCreateDateTimeStart(), conditionModel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
DdlPreparedPack.getOrderByPack(new Object[]{conditionModel.getAscOrDesc()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
List<MesWorkCellScanMonitorLog> workCellScanMonitorLogList = workCellScanMonitorLogRepository.findByHqlTopWhere(packBean, conditionModel.getLimit());
@ -184,7 +185,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
DdlPreparedPack.getNumEqualPack(conditionModel.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
DdlPreparedPack.getStringEqualPack(conditionModel.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
DdlPreparedPack.getStringLikerPack(conditionModel.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
DdlPreparedPack.timeBuilder(conditionModel.getCreateDatetimeStart(), conditionModel.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
DdlPreparedPack.timeBuilder(conditionModel.getCreateDateTimeStart(), conditionModel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
DdlPreparedPack.getOrderByPack(new Object[]{conditionModel.getAscOrDesc()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
List<MesEquipmentLogDetail> equipmentLogDetailList = equipmentLogDetailRepository.findByHqlTopWhere(packBean, conditionModel.getLimit());

4
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java
Unescape Escape View File

@ -68,10 +68,10 @@ public class MesWorkCellScanMonitorConditionModel {
private Integer ascOrDesc = CommonEnumUtil.ASC_OR_DESC.DESC.getValue();
@ApiParam("查询时间起始")
private String createDatetimeStart;
private String createDateTimeStart;
@ApiParam("查询时间截止")
private String createDatetimeEnd;
private String createDateTimeEnd;
@ApiParam("日志类型")
private List<Integer> logTypeList;

Write Preview
Loading…
Cancel
Save