Commit 03f69f85 authored by tianbo's avatar tianbo

feature(cylinder):气站卸液量对接接口

parent bec6121e
...@@ -5,7 +5,6 @@ import com.yeejoin.amos.api.common.restful.utils.ResponseModel; ...@@ -5,7 +5,6 @@ import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.face.dto.CylinderFillingMessage; import com.yeejoin.amos.api.openapi.face.dto.CylinderFillingMessage;
import com.yeejoin.amos.api.openapi.face.model.*; import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.service.*; import com.yeejoin.amos.api.openapi.face.service.*;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -29,7 +28,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest; ...@@ -29,7 +28,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping(value = "/cylinder") @RequestMapping(value = "/cylinder")
...@@ -59,6 +57,9 @@ public class CylinderController { ...@@ -59,6 +57,9 @@ public class CylinderController {
@Autowired @Autowired
private EmqKeeper emqKeeper; private EmqKeeper emqKeeper;
@Autowired
private TmCylinderOffloadingService cylinderOffloadingService;
private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
...@@ -189,4 +190,13 @@ public class CylinderController { ...@@ -189,4 +190,13 @@ public class CylinderController {
return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData)); return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "气站卸液量记录数据")
@PostMapping(value = "/offloading")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> createCylinderOffloading(@RequestBody List<TmCylinderOffloadingModel> offloadingData) {
cylinderFillingDataValidationService.validateCylinderOffloadingData(offloadingData);
return ResponseHelper.buildResponse(cylinderOffloadingService.createCylinderOffloading(offloadingData));
}
} }
...@@ -451,4 +451,29 @@ public class CylinderFillingDataValidationService { ...@@ -451,4 +451,29 @@ public class CylinderFillingDataValidationService {
} }
return null; return null;
} }
/**
* 气站卸液量记录数据校验
*
* @param offloadingData 卸液量数据
*/
public void validateCylinderOffloadingData(List<TmCylinderOffloadingModel> offloadingData) {
JSONArray jsonArray = JSONArray.fromObject(offloadingData);
// 1.必填校验
List<String> errorRows = validateRequired(CylinderOffloadingFieldEnum.getAllRequireKeys(), jsonArray);
if (!ObjectUtils.isEmpty(errorRows)) {
throw new BadRequest(JSONArray.fromObject( errorRows.stream().map(e -> "必填字段不能为空:" + e).collect(Collectors.toList())).toString());
}
// 2.本次上传数据唯一性校验
errorRows = validateUnique(CylinderOffloadingFieldEnum.getAllUniqueKeys(), jsonArray);
if (!ObjectUtils.isEmpty(errorRows)) {
throw new BadRequest(JSONArray.fromObject( errorRows.stream().map(e -> "上传数据重复:" + e).collect(Collectors.toList())).toString());
}
// // 3.检查企业统一社会信用代码是否存在
// Set<String> creditCodes = getAllData(FillingBeforeFieldEnum.creditCode.name(), jsonArray);
// errorRows = getNotExistEnterpriseInfoByCreditCode(creditCodes);
// if (!ObjectUtils.isEmpty(errorRows)) {
// throw new BadRequest(JSONArray.fromObject(errorRows.stream().map(e -> "企业统一社会信用代码不存在:" + e).collect(Collectors.toList())).toString());
// }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment