Merge branch 'develop_tzs_register' of…

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

@@ -115,6 +115,7 @@ public class CylinderController {
 		try {
 			validateResult = cylinderFillingDataValidationService.validateFilling(jsonobject);
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.error("液化气体气瓶充装信息上报，数据校验失败");
 			cylinderFillingMessage.setMessage(e.getMessage());
 		}
@@ -132,7 +133,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());
 			}
 
@@ -152,15 +153,17 @@ public class CylinderController {
 
 				throw new BadRequest(error.toString());
 			}
+		} else {
+			throw new BadRequest("数据校验失败！！！");
 		}
 
-
-		Map<String, Class> classMap = new HashMap<>();
-		classMap.put("fillingBefore", TmCylinderFillingModel.class);
-		classMap.put("filling", TmCylinderFillingRecordModel.class);
-		classMap.put("fillingAfter", TmCylinderFillingCheckModel.class);
-		TmCylinderFillingModelList cylinderFillingModelList = (TmCylinderFillingModelList) JSONObject.toBean(jsonobject,
-				TmCylinderFillingModelList.class, classMap);
+//		Map<String, Class> classMap = new HashMap<>();
+//		classMap.put("fillingBefore", TmCylinderFillingModel.class);
+//		classMap.put("filling", TmCylinderFillingRecordModel.class);
+//		classMap.put("fillingAfter", TmCylinderFillingCheckModel.class);
+		TmCylinderFillingModelList cylinderFillingModelList = com.alibaba.fastjson.JSONObject.parseObject(fillingData, TmCylinderFillingModelList.class);
+//		TmCylinderFillingModelList cylinderFillingModelList = (TmCylinderFillingModelList) JSONObject.toBean(jsonobject,
+//				TmCylinderFillingModelList.class, classMap);
 
 		List<TmCylinderFillingModel> fillingBeforeList = cylinderFillingModelList.getFillingBefore();
 		List<TmCylinderFillingRecordModel> fillingList = cylinderFillingModelList.getFilling();

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ public class TmCylinderFillingModel extends AbstractBaseModel{
 	private String isValid;	//是否在检验有效期以内，严禁充装超期未检气瓶、非法改装或翻新及报废气瓶
 	private int same;	//警示标签上印有的瓶装气体的名称及化学分子式应与气瓶钢印标志是否一致*
 	private int isRegulations;	//气瓶外表面的颜色标志是否符合规定*
+	@JSONField(name = "isComplianceWithGBT")
 	private int isComplianceWithgbt;	//气瓶瓶阀的出气口螺纹型式是否符合GB/T15383的规定，即可燃气体用的瓶阀，出口螺纹应是内螺纹（左旋）*
 	private int haveStillPressure;	//气瓶内有无剩余压力*
 	private int isComplete;	//气瓶外表面有无裂纹、严重腐蚀、明显变形及其他严重外部损伤缺陷*

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());
                 }
             }