Bladeren bron

微浦MES,PDA增加在线获取版本的接口

xiaost 1 week geleden
bovenliggende
commit
ba54bf5c46

+ 7 - 0
src/com/uas/mes/api/pda/PdaLoginController.java

@@ -284,4 +284,11 @@ public class PdaLoginController extends BaseApiController{
 	private boolean isDenyVirtualUser() {
 		return baseDao.isDBSetting("denyVirtualUserLogin");
 	}
+
+	@RequestMapping(value="api/pda/getPdaVersion.action",method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap getPdaVersion(String code){
+		Map<String, Object> map = pdaLoginService.getPdaVersion(code);
+		return success(map);
+	}
 }

+ 4 - 2
src/com/uas/mes/pda/service/PdaLoginService.java

@@ -2,10 +2,12 @@ package com.uas.mes.pda.service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 public interface PdaLoginService {
 
-	public String login(String master, String j_username, String j_password, String ip, boolean isMobile, HttpSession session);
+	String login(String master, String j_username, String j_password, String ip, boolean isMobile, HttpSession session);
+	 String logout(HttpServletRequest request);
 
-	public String logout(HttpServletRequest request);
+    Map<String, Object> getPdaVersion(String code);
 }

+ 17 - 0
src/com/uas/mes/pda/service/impl/PdaLoginServiceImpl.java

@@ -1,6 +1,8 @@
 package com.uas.mes.pda.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -15,6 +17,8 @@ import com.uas.mes.common.entity.Master;
 import com.uas.mes.common.service.EnterpriseService;
 import com.uas.mes.core.data.SpObserver;
 import com.uas.mes.pda.service.PdaLoginService;
+import com.uas.mes.core.data.SqlRowList;
+import com.uas.mes.core.util.StringUtil;
 
 @Service("pdaLoginServiceImpl")
 public class PdaLoginServiceImpl implements PdaLoginService {
@@ -77,4 +81,17 @@ public class PdaLoginServiceImpl implements PdaLoginService {
 		}
 		return null;
 	}
+
+	@Override
+	public Map<String, Object> getPdaVersion(String code) {
+		Map<String, Object> dataMap = new HashMap<>();
+		SqlRowList rs = baseDao.queryForRowSet("select pp_versionnum,pp_attach,pp_remark,pp_versionname from (select pp_versionnum,pp_attach,pp_remark,pp_versionname from pdaapplication where pp_pdacode=? order by PP_RECORDERDATE DESC) where rownum=1", StringUtil.hasText(code)?code:"UAS_SMART");
+		if (rs.next()){
+			dataMap.put("pp_versionnum",rs.getString("pp_versionnum"));
+			dataMap.put("pp_attach",rs.getString("pp_attach"));
+			dataMap.put("pp_remark",rs.getString("pp_remark"));
+			dataMap.put("pp_versionname",rs.getString("pp_versionname"));
+		}
+		return dataMap;
+	}
 }