|
|
@@ -10,6 +10,7 @@ import com.uas.eis.sdk.entity.ApiResult;
|
|
|
import com.uas.eis.service.MESDataService;
|
|
|
import com.uas.eis.service.MESHelperService;
|
|
|
import com.uas.eis.utils.*;
|
|
|
+import net.sf.json.JSONArray;
|
|
|
import net.sf.json.JSONObject;
|
|
|
import net.sf.json.JsonConfig;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
@@ -144,6 +145,32 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return remap;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public JSONArray getFiles(String accessKey, String requestId, String id) {
|
|
|
+ String AE_MASTER = checkAccessKey(accessKey, requestId);
|
|
|
+ accessKey1=accessKey;
|
|
|
+ SpObserver.putSp(AE_MASTER);
|
|
|
+ Master=AE_MASTER;
|
|
|
+ JSONArray arr = new JSONArray();
|
|
|
+ JSONObject obj = null;
|
|
|
+ for (String i : id.split(";")) {
|
|
|
+ if (i != null && !i.trim().equals("")) {
|
|
|
+ SqlRowList rs = baseDao.queryForRowSet("SELECT * FROM "+Master+".FilePath WHERE fp_id=" + i);
|
|
|
+ if(rs.next()){
|
|
|
+ JSONObject o = new JSONObject();
|
|
|
+ o.put("fp_id", i);
|
|
|
+ o.put("fp_path", rs.getString("fp_path"));
|
|
|
+ o.put("fp_size", rs.getInt("fp_size"));
|
|
|
+ o.put("fp_name", rs.getString("fp_name"));
|
|
|
+ o.put("fp_date", rs.getGeneralTimestamp("fp_date"));
|
|
|
+ o.put("fp_man", rs.getString("fp_man"));
|
|
|
+ arr.add(obj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return arr;
|
|
|
+ }
|
|
|
+
|
|
|
private Map<Object,Object> GetMakeInfo(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String iSN=null;
|
|
|
@@ -251,7 +278,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ct_code,ct_number_3,ct_varchar50_18,ct_varchar500_1,ct_varchar500_2,ct_varchar500_3,ct_varchar500_4,ct_varchar500_5,ct_number_2,ct_varchar50_27,ct_number_19,ct_varchar50_30,ct_varchar50_25,ct_number_12,ct_number_23,ct_varchar50_34,ct_varchar50_39,ct_varchar50_22,ct_statuscode,ct_date_1,ct_status,ct_recorder,ct_varchar50_10,ct_date_2,ct_id,ct_varchar50_1,ct_varchar50_2,ct_varchar50_3,ct_varchar50_4,ct_varchar50_5,ct_varchar50_6,ct_varchar50_7,ct_varchar50_8,ct_varchar50_11,ct_number_1,ct_varchar50_9,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_caller,ct_date_3,ct_varchar50_17" +
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ct_code,ct_number_3,ct_varchar50_18,ct_varchar500_1,ct_varchar500_2,ct_varchar500_3,ct_varchar500_4,ct_varchar500_5,ct_number_2,ct_varchar50_27,ct_number_19,ct_varchar50_30,ct_varchar50_25,ct_number_12,ct_number_23,ct_varchar50_34,ct_varchar50_39,ct_varchar50_22,ct_statuscode,ct_date_1,ct_status,ct_recorder,ct_varchar50_10,ct_date_2,ct_id,ct_varchar50_1,ct_varchar50_2,ct_varchar50_3,ct_varchar50_4,ct_varchar50_5,ct_varchar50_6,ct_varchar50_7,ct_varchar50_8,ct_varchar50_11,ct_number_1,ct_varchar50_9,ct_varchar50_12,ct_varchar50_13,ct_varchar50_14,ct_varchar50_15,ct_varchar50_16,ct_caller,ct_date_3,ct_varchar50_17,ct_varchar2000_2" +
|
|
|
" from "+Master+".CUSTOMTABLE where ct_id="+map.get("CT_ID") +" and ct_caller='MakeFee'");
|
|
|
if(rs.next()){
|
|
|
for(String key:rs.getCurrentMap().keySet()){
|