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

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderController.java

@@ -65,6 +65,7 @@ public class CylinderController {
 	@PostMapping(value = "/info")
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderInfo(@RequestBody List<TmCylinderInfoModel> infoData) throws Exception {
+		cylinderFillingDataValidationService.validateCylinderInfo(infoData);
 		return ResponseHelper.buildResponse(cylinderInfoService.createCylinderInfo(infoData));
 	}
 
@@ -73,6 +74,7 @@ public class CylinderController {
 	@PostMapping(value = "/tag")
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderTagInfo(@RequestBody List<TmCylinderTagsModel> tagData) throws Exception {
+		cylinderFillingDataValidationService.validateCylinderTag(tagData);
 		return ResponseHelper.buildResponse(cylinderTagsService.createCylinderTag(tagData));
 	}
 
@@ -81,6 +83,7 @@ public class CylinderController {
 	@PostMapping(value = "/inspection")
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<TmCylinderInspectionModel> inspectionData) throws Exception {
+		cylinderFillingDataValidationService.validateCylinderInspection(inspectionData);
 		return ResponseHelper.buildResponse(cylinderInspectionService.createCylinderInspection(inspectionData));
 
 	}
@@ -91,8 +94,11 @@ public class CylinderController {
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderFillingInfo(@RequestBody String fillingData) throws Exception {
 
-		logger.info("气瓶充装数据"+fillingData);
+//		logger.info("气瓶充装数据"+fillingData);
 		JSONObject jsonobject = JSONObject.fromObject(fillingData);
+
+		cylinderFillingDataValidationService.validateFilling(jsonobject);
+
 		Map<String, Class> classMap = new HashMap<String, Class>();
 		classMap.put("fillingBefore", TmCylinderFillingModel.class);
 		classMap.put("filling", TmCylinderFillingRecordModel.class);
@@ -125,6 +131,7 @@ public class CylinderController {
 	@PostMapping(value = "/fillingAudit")
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderFillingAudit(@RequestBody List<TmCylinderFillingExamineModel> fillingAuditData) throws Exception {
+		cylinderFillingDataValidationService.validateCylinderFillingExamineModel(fillingAuditData);
 		return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData));
 
 	}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderFillingDataValidationService.java

@@ -120,7 +120,7 @@ public class CylinderFillingDataValidationService {
      * @param inspectionData
      * @return
      */
-    boolean validateCylinderInspection(List<TmCylinderInspectionModel> inspectionData) {
+    public boolean validateCylinderInspection(List<TmCylinderInspectionModel> inspectionData) {
         JSONArray jsonArray = JSONArray.fromObject(inspectionData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderInspectionFieldEnum.getAllRequireKeys(), jsonArray);
@@ -148,7 +148,7 @@ public class CylinderFillingDataValidationService {
      * @param inspectionData
      * @return
      */
-    boolean validateCylinderFillingExamineModel(List<TmCylinderFillingExamineModel> inspectionData) {
+    public boolean validateCylinderFillingExamineModel(List<TmCylinderFillingExamineModel> inspectionData) {
         JSONArray jsonArray = JSONArray.fromObject(inspectionData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderFillingAuditFieldEnum.getAllRequireKeys(), jsonArray);
@@ -176,6 +176,18 @@ public class CylinderFillingDataValidationService {
      */
     public CylinderFillingDataValidationResultModel validateFilling(JSONObject jsonobject) throws ExecutionException, InterruptedException {
         CylinderFillingDataValidationResultModel result = new CylinderFillingDataValidationResultModel();
+        if (ObjectUtils.isEmpty(jsonobject)) {
+          throw new BadRequest("上传数据不能为空！！！");
+        }
+        if (!jsonobject.containsKey("fillingBefore") || ObjectUtils.isEmpty(jsonobject.get("fillingBefore"))) {
+            throw new BadRequest("充装前检查数据不能为空！！！");
+        }
+        if (!jsonobject.containsKey("filling") || ObjectUtils.isEmpty(jsonobject.get("filling"))) {
+            throw new BadRequest("充装数据不能为空！！！");
+        }
+        if (!jsonobject.containsKey("fillingAfter") || ObjectUtils.isEmpty(jsonobject.get("fillingAfter"))) {
+            throw new BadRequest("充装后复查数据不能为空！！！");
+        }
         CompletableFuture<List<String>> beforeFuture = CompletableFuture.supplyAsync(() -> {
             // 异步校验检验前数据
             return validateFillingBeforeData(jsonobject.getJSONArray("fillingBefore"));

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderUnitController.java

@@ -84,7 +84,7 @@ public class CylinderUnitController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个气瓶企业信息", notes = "根据sequenceNbr查询单个气瓶企业信息")
 	public ResponseModel<CylinderUnitDto> selectOne(@RequestParam Long id) {
 		CylinderUnitDto unit = cylinderUnitServiceImpl.queryBySeq(id);
-		unit.setEvaluate("5");
+		unit.setEvaluate("★★★★★");
 		// 查询气瓶数量以及过期数量
 		Map<String, String> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());