|
|
@@ -689,6 +689,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String CORLID="";
|
|
|
String CPU="";
|
|
|
String PN="";
|
|
|
+ String oWIDEVINE="";
|
|
|
if(map.get("iSN")==null){
|
|
|
oErrMessage = "SN不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
@@ -698,7 +699,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
|
|
|
if(ms_id!=null)
|
|
|
{
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ms_id, ms_mac, ms_bt, ms_meid, ms_netcode, ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3,MS_UUID, MS_KEYID, MS_KEYPRODCODE, MS_ICCID, MS_IMSI, MS_SIM, MS_CARCODE, MS_CORLID, MS_CPU, MS_PN from MakeSerial where ms_id="+ms_id.toString());
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ms_id, ms_mac, ms_bt, ms_meid, ms_netcode, ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3,MS_UUID, MS_KEYID, MS_KEYPRODCODE,ms_widevine_base64, MS_ICCID, MS_IMSI, MS_SIM, MS_CARCODE, MS_CORLID, MS_CPU, MS_PN from MakeSerial where ms_id="+ms_id.toString());
|
|
|
if(rs.next()){
|
|
|
oWIFI = rs.getString("ms_mac");
|
|
|
oBT = rs.getString("ms_bt");
|
|
|
@@ -723,6 +724,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
CORLID=rs.getString("ms_corlid");
|
|
|
CPU=rs.getString("ms_cpu");
|
|
|
PN=rs.getString("ms_pn");
|
|
|
+ oWIDEVINE=rs.getString("ms_widevine_base64");
|
|
|
}
|
|
|
}else
|
|
|
{
|
|
|
@@ -756,6 +758,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oCORLID",CORLID);
|
|
|
rmap.put("oCPU",CPU);
|
|
|
rmap.put("oPN",PN);
|
|
|
+ rmap.put("oWIDEVINE",oWIDEVINE);
|
|
|
}
|
|
|
else
|
|
|
rmap.put("oErrMessage",oErrMessage);
|