设置支持Json格式

src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -4,6 +4,7 @@ import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.sdk.resp.ApiResponse;
 import com.uas.eis.service.MESHelperService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,7 +24,7 @@ public class MESHelperController {
     private MESHelperService mesHelperService;
 
     @RequestMapping(value="/dllMain")
-    public ApiResult<Map<Object,Object>> DLLMain(HttpServletRequest request, String data){
+    public ApiResult<Map<Object,Object>> DLLMain(HttpServletRequest request, @RequestBody String data){
         Map<String, Object> modelMap = new HashMap<String, Object>();
         String accessKey = request.getHeader("AccessKey");
         String requestId = request.getHeader("RequestId");

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -197,9 +197,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 	private Map<Object,Object> CheckRoutePassed(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
 		String iSN=map.get("iSN").toString();
 		String iResCode=map.get("iResCode").toString();
-		String oErrMessage="";
 		if (iSN ==null)
 		{
 			oErrMessage = "SN不能为空";
@@ -270,21 +275,19 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 				else
 				{
-					SqlRowList rs1=baseDao.queryForRowSet("select ur_resourcecode from cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code where eg_emcode = '"+ iUserCode + "' and sc_statuscode='AUDITED'");
+					SqlRowList rs1=baseDao.queryForRowSet("select ur_resourcecode from cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code where eg_emcode = '"+ iUserCode + "' and  sc_statuscode='AUDITED'");
 					//如果存在该编号
 					if (rs1.next())
 					{
 						//判断如果多个岗位资源存在，用户输入的只要在其中就行
 						while (rs.next())
 						{
-							if (!rs.getString("ur_resourcecode").equals("iResCode")){
-								oErrMessage = "用户不处于当前资源所属分组!";
-							}else
-							{
+							if (rs.getString("ur_resourcecode").equals(iResCode)){
 								oErrMessage=null;
 								continue;
 							}
 						}
+						oErrMessage = "用户不处于当前资源所属分组!";
 					}
 					else
 						oErrMessage = "岗位资源编号错误或者未审核！";