upd

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/DeviceServiceImpl.java

@@ -1662,18 +1662,33 @@ public class DeviceServiceImpl extends AppBaseService implements DeviceService
 		Map<String, Object> record = new HashMap<String, Object>();
 		String itp="";
 		if(flag==1)
-			itp="select kasid from iccidtemp where LEFT(iccid,19)='"+iccid.substring(0,19)+"'";
+			itp="select kasid,appid,pwd,iccid from iccidtemp where LEFT(iccid,19)='"+iccid.substring(0,19)+"'";
 		else
-			itp="select kasid from iccidtemp where iccid='"+iccid+"'";
+			itp="select kasid,appid,pwd,iccid from iccidtemp where iccid='"+iccid+"'";
 		logger.info(itp);
 		List<Map<String,Object>> itplist=DAOHelper.find("ufiiccid", itp);
 		if(itplist!=null && itplist.size()>0)
 		{
 			Map<String,Object> m=itplist.get(0);
+            if (itplist.size()>1){
+                for (Map<String, Object> map : itplist) {
+                    String s = String.valueOf(map.get("iccid"));
+                    if (iccid.equals(s)){
+                        m=map;
+                        break;
+                    }
+                }
+            }
 			String kasid=m.get("kasid").toString();
 			
 			String ks="select * from kas where id="+kasid;
 			Map<String, Object> mks=RCPService.getBaseService().getMap(ks);
+            if (m.get("appid")!=null){
+                mks.put("appid", m.get("appid"));
+            }
+            if (m.get("pwd")!=null){
+                mks.put("pwd", m.get("pwd"));
+            }
 			record.put("kas", mks);
 		}
 		record.put("code", 0);

com.sharemao.web.manager/src/main/java/com/sharemao/manager/ctrl/KasCtrl.java

@@ -82,14 +82,18 @@ public class KasCtrl {
 	public ExcelView template(Context context) {
 		List<Object[]> result=new ArrayList<Object[]>();
 		
-		Object[] cols = new Object[2];
+		Object[] cols = new Object[4];
 		cols[0] = "iccid";
 		cols[1] = "access_number";
+		cols[2] = "appid";
+		cols[3] = "pwd";
 		result.add(cols);
 		
-		Object[] cols1 = new Object[2];
+		Object[] cols1 = new Object[4];
 		cols1[0] = "2160676326301856";
 		cols1[1] = "11326301856";
+		cols1[2] = "CM311225626723";
+		cols1[3] = "HFlBox,2*onR";
 		result.add(cols1);
 		
 		return new ExcelView(result);

com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/KasServiceImpl.java

@@ -157,18 +157,20 @@ public class KasServiceImpl extends DevBaseService implements KasService {
 			//控制循环读取一行数据
 			String iccid = sheet.getCell(0, i).getContents() == null ? "" : sheet.getCell(0, i).getContents().trim();
 			String access_number = sheet.getCell(1, i).getContents() == null ? "" : sheet.getCell(1, i).getContents().trim();
+			String appid = sheet.getCell(2, i).getContents() == null ? "" : sheet.getCell(2, i).getContents().trim();
+			String pwd = sheet.getCell(3, i).getContents() == null ? "" : sheet.getCell(3, i).getContents().trim();
 			if(!Tools.isEmpty(iccid))
 			{
 				p++;
 
 				if(iccidMap.get(iccid)==null)
 				{
-					String insql="INSERT INTO iccidtemp(iccid,orgid,access_number,kasid) VALUES ('"+iccid+"',"+orgid+",'"+access_number+"',"+kasid+")";
+					String insql="INSERT INTO iccidtemp(iccid,orgid,access_number,kasid,appid,pwd) VALUES ('"+iccid+"',"+orgid+",'"+access_number+"',"+kasid+",'"+appid+"','"+pwd+"')";
                     sqls.add(insql);
 				}
 				else
 				{
-					String devSql = "UPDATE iccidtemp SET orgid="+orgid+",access_number='"+access_number+"',kasid="+kasid+" WHERE iccid='"+iccid+"'";
+					String devSql = "UPDATE iccidtemp SET orgid="+orgid+",access_number='"+access_number+"',kasid="+kasid+",appid='"+appid+"',pwd='"+pwd+"' WHERE iccid='"+iccid+"'";
                     sqls.add(devSql);
 				}
 			}