|
|
@@ -168,11 +168,10 @@ public class StepWorkServiceImpl implements StepWorkService {
|
|
|
* @param data
|
|
|
* 数据格式
|
|
|
* {
|
|
|
- * "SN":"序列号", //必填
|
|
|
* "DeviceType":"", //必填
|
|
|
* "MacStart":"",
|
|
|
* "MacEnd":"",
|
|
|
- * "WholeDeviceCode":"",
|
|
|
+ * "WholeDeviceCode":"", //必填 表示SN号
|
|
|
* "CameraID":"",
|
|
|
* "ExtCode":"",
|
|
|
* "EncryKey":"",
|
|
|
@@ -186,9 +185,9 @@ public class StepWorkServiceImpl implements StepWorkService {
|
|
|
public StepWorkApiResult<Map<String, Object>> checkProdParam(HttpServletRequest request, String data) {
|
|
|
//解析data 获取数据
|
|
|
Map<Object,Object> map = BaseUtil.parseFormStoreToMap(data);
|
|
|
- Object sn = map.get("SN");
|
|
|
+ Object sn = map.get("WholeDeviceCode");
|
|
|
if(!StringUtil.hasText(sn)){
|
|
|
- return StepWorkApiResponse.failRsp("传参:SN,异常不能为空!");
|
|
|
+ return StepWorkApiResponse.failRsp("传参:WholeDeviceCode,异常不能为空!");
|
|
|
}
|
|
|
Object prodcode = map.get("DeviceType");
|
|
|
if(!StringUtil.hasText(prodcode)){
|
|
|
@@ -213,7 +212,7 @@ public class StepWorkServiceImpl implements StepWorkService {
|
|
|
if(rs.next()){
|
|
|
macode = rs.getGeneralString("ma_code");
|
|
|
}else{
|
|
|
- return StepWorkApiResponse.failRsp("(SN:"+sn+"和DeviceType:"+prodcode+"),未找到工作中心是组装的工单!");
|
|
|
+ return StepWorkApiResponse.failRsp("(WholeDeviceCode:"+sn+"和DeviceType:"+prodcode+"),未找到工作中心是组装的工单!");
|
|
|
}
|
|
|
|
|
|
// 解析配置字段列表
|