修改：修改气瓶同步消息

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

@@ -114,6 +114,7 @@ public class CylinderController {
 		try {
 			validateResult = cylinderFillingDataValidationService.validateFilling(jsonobject);
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.error("液化气体气瓶充装信息上报，数据校验失败");
 			cylinderFillingMessage.setMessage(e.getMessage());
 		}
@@ -131,7 +132,7 @@ public class CylinderController {
 
 			if (!ObjectUtils.isEmpty(validateResult.getRecordErrorData())) {
 				errorNumber += validateResult.getRecordErrorData().size();
-				error.put("充装填充错误数据：", validateResult.getRecordErrorData());
+				error.put("填充错误数据：", validateResult.getRecordErrorData());
 				message.add("充装记录数据异常气瓶数：" + validateResult.getRecordErrorCylinderNumber());
 			}
 
@@ -151,6 +152,8 @@ public class CylinderController {
 
 				throw new BadRequest(error.toString());
 			}
+		} else {
+			throw new BadRequest("数据校验失败！！！");
 		}
 
 //		Map<String, Class> classMap = new HashMap<>();

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipRegistrationInfoMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipRegistrationInfo;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import net.sf.json.JSONArray;
+import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -375,7 +376,7 @@ public class CylinderFillingDataValidationService {
         for (int i = 0; i < jsonArray.size(); i++) {
             JSONObject row = jsonArray.getJSONObject(i);
             for (String key : keys) {
-                if (!row.containsKey(key) || ObjectUtils.isEmpty(row.get(key) )) {
+                if (!row.containsKey(key) || ObjectUtils.isEmpty(row.get(key)) || row.get(key).equals(JSONNull.getInstance())) {
                     errorList.add(row.toString());
                 }
             }