合并basecontroller，提升controller的切面

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

-package com.yeejoin.amos.boot.module.jcs.biz.aop;
+package com.yeejoin.amos.boot.biz.common.aop;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import javax.servlet.http.HttpServletRequest;
@@ -46,7 +47,7 @@ public class ControllerAop {
     @Autowired
     private RedisUtils redisUtils;
 
-    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..))")
+    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..)) || execution(public * com.yeejoin.amos.*.business.controller..*(..))")
     public void userCache() {
 
     }
@@ -56,6 +57,18 @@ public class ControllerAop {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         String token = request.getHeader("token");
+	    if (token == null) {
+	    	 token = request.getHeader("X-Access-Token");
+	     }
+        String authProduct = request.getHeader("product");
+	    if (authProduct == null) {
+	    	authProduct = request.getParameter("product");
+	    }
+        String authAppKey = request.getHeader("appKey");
+	    if (authAppKey == null) {
+	    	authAppKey = request.getParameter("appKey");
+	    }
+        String authToken = buildKey(token);
         if (token != null) {
         	//验证token有效性，防止token失效
         	AgencyUserModel userModel;
@@ -67,7 +80,7 @@ public class ControllerAop {
                  }
 			} catch (Exception e) {
 				//删除失效token缓存
-				redisUtils.del(buildKey(token));
+				redisUtils.del(authToken);
 				throw new RuntimeException(e.getMessage());
 			}
              // 不需要添加请求头的接口
@@ -76,12 +89,13 @@ public class ControllerAop {
             if (Arrays.asList(url).contains(request.getRequestURI())) {
                 // 暂无需要
             } else {
-                if (!redisUtils.hasKey(buildKey(token))) {
+                if (!redisUtils.hasKey(authToken)) {
                 	  saveUserRedis(userModel, token);
                 }
              }
         }
-        System.out.println(redisUtils.get(buildKey(token)));
+//        buildRequestCxt(authToken,authProduct,authAppKey);
+        System.out.println(redisUtils.get(authToken));
     }
 
     public void saveUserRedis(AgencyUserModel user, String token) {
@@ -112,7 +126,8 @@ public class ControllerAop {
         reginParams.setRole(role);
         reginParams.setDepartment(department);
         reginParams.setUserModel(user);
-        redisUtils.set(buildKey(token), JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
+        String authToken = buildKey(token);
+        redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
     }
     public String buildKey(String token) {
     	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
@@ -130,4 +145,9 @@ public class ControllerAop {
 //            GlobalCache.paramMap.remove(token);
 //        }
     }
+//	public void buildRequestCxt(String token,String product,String appKey){
+//	RequestContext.setToken(token);
+//	RequestContext.setProduct(product);
+//	RequestContext.setAppKey(appKey);
+//}
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

 package com.yeejoin.amos.boot.biz.common.controller;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,9 +10,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import springfox.documentation.annotations.ApiIgnore;
@@ -27,6 +26,8 @@ public class BaseController {
 
 	@Autowired
 	private RedisUtils redisUtils;
+	@Autowired
+	protected HttpServletRequest request;
 
 	/**
 	 * 获取token
@@ -34,28 +35,22 @@ public class BaseController {
 	protected String getToken() {
 		return RequestContext.getToken();
 	}
-
-	protected String buildKey(String token) {
-		// 由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
-		return "region_" + token;
-
-	}
-
+    public String buildKey(String token) {
+    	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
+        //return "region_" + userId + "_" + token;
+        return "region_"+ token;
+    }
 	/**
 	 * 用户选择信心redis获取
 	 **/
 	protected ReginParams getSelectedOrgInfo() {
-		return JSONObject.parseObject(redisUtils.get(buildKey(RequestContext.getToken())).toString(),
-				ReginParams.class);
+		return JSONObject.parseObject(redisUtils.get(buildKey(RequestContext.getToken())).toString(), ReginParams.class);
 	}
 
 	protected String getOrgCode(ReginParams reginParams) {
 		if (reginParams == null) {
 			return null;
 		}
-//    if (reginParams.getDepartment() != null) {
-//        return reginParams.getDepartment().getDeptOrgCode();
-//    }
 		if (reginParams.getCompany() != null) {
 			return reginParams.getCompany().getOrgCode();
 		}
@@ -67,19 +62,74 @@ public class BaseController {
 	 * 当前登录用户信息
 	 */
 	protected AgencyUserModel getUserInfo() {
-		AgencyUserModel userModel = null;
-		if (getToken() != null) {
-			FeignClientResult<?> feignClientResult;
-			try {
-				feignClientResult = Privilege.agencyUserClient.getme();
-				userModel = (AgencyUserModel) feignClientResult.getResult();
+		ReginParams reginParams = getSelectedOrgInfo();
+		return reginParams.getUserModel();
+	}
+
+	protected String getProduct() {
+		return RequestContext.getProduct();
+	}
+
+	protected String getAppKey() {
+
+		return RequestContext.getAppKey();
+	}
 
-			} catch (InnerInvokException e) {
-				throw new RuntimeException(e.getMessage());
-			}
+	protected String getUserId() {
+		String userId = null;
+		if (getUserInfo() != null) {
+			userId = getUserInfo().getUserId();
+		}
+		return userId;
+	}
 
+	protected String getRoleTypeName(ReginParams reginParams) {
+		if (reginParams == null) {
+			return null;
+		}
+		if (reginParams.getRole() != null) {
+			return reginParams.getRole().getRoleType();
 		}
-		return userModel;
+		return null;
+	}
 
+	protected String getDepartmentId(ReginParams reginParams) {
+		if (reginParams == null) {
+			return null;
+		}
+		if (reginParams.getDepartment().getSequenceNbr() != null) {
+			return reginParams.getDepartment().getSequenceNbr().toString();
+		}
+		return null;
+	}
+
+	protected String getDepartmentName(ReginParams reginParams) {
+		if (reginParams == null) {
+			return null;
+		}
+		if (reginParams.getDepartment().getDepartmentName() != null) {
+			return reginParams.getDepartment().getDepartmentName();
+		}
+		return null;
+	}
+
+	protected String getCompanyId(ReginParams reginParams) {
+		if (reginParams == null) {
+			return null;
+		}
+		if (reginParams.getCompany() != null) {
+			return reginParams.getCompany().getSequenceNbr().toString();
+		}
+		return null;
+	}
+
+	protected String getCompanyName(ReginParams reginParams) {
+		if (reginParams == null) {
+			return null;
+		}
+		if (reginParams.getCompany() != null) {
+			return reginParams.getCompany().getCompanyName();
+		}
+		return null;
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -89,8 +89,8 @@ public class AlertCalledController extends BaseController {
                  || ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalled()))
              throw new BadRequest("参数校验失败.");
     	 ReginParams reginParams =
- 				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
- 						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+ 				JSONObject.parseObject(null != redisUtils.get(getToken()) ?
+ 						redisUtils.get(getToken()).toString() : null, ReginParams.class);
     		//获取当前登录人公司
     	String name= reginParams.getCompany().getCompanyName();
     	AlertCalled alertCalled =  alertCalledObjsDto.getAlertCalled();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/AbstractBaseController.java

@@ -7,26 +7,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ConstraintViolationException;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanMap;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.TransactionSystemException;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
@@ -47,151 +32,151 @@ public abstract class AbstractBaseController extends BaseController{
 	/*@Autowired
 	private RemoteSecurityServer remoteSecurityServer;
 */
-	@Autowired
-	protected HttpServletRequest request;
-
-	/**
-	 * 成功返回状态
-	 */
-	protected static final String SUCCESS = "SUCCESS";
-
-	/**
-	 * 失败返回状态
-	 */
-	protected static final String FAILED = "FAILED";
-
-	/**
-	 * 默认页大小
-	 */
-	protected static final int DEFAULT_PAGE_SIZE = 10;
-
-	  @Autowired
-	    private RedisTemplate<String, String> redisTemplate;
-	  
-	  
-	protected String getToken() {
-        String authToken = request.getHeader("token");
-        if (authToken == null) {
-            authToken = request.getHeader("X-Access-Token");
-        }
-        return authToken;
-    }
-    
-    protected String getProduct() {
-        String authToken = request.getHeader("product");
-        if (authToken == null) {
-            authToken = request.getParameter("product");
-        }
-        return authToken;
-    }
-
-    
-    protected String getAppKey() {
-        String authToken = request.getHeader("appKey");
-        if (authToken == null) {
-            authToken = request.getParameter("appKey");
-        }
-        return authToken;
-    }
-	/**
-	 * 
-	 * <pre>
-	 * 判断当前用户角色级别：true:主管/false:装备管理员
-	 * </pre>
-	 *
-	 * @return
-	 */
-	/*protected boolean isDirector() {
-		if (getUserInfo() == null) {
-			return false;
-		}
-		return getUserInfo().getRole().getRoleType() != 3;
-	}*/
-
-	/**
-	 * 获取用户角色id
-	 * 
-	 * @return
-	 */
-	/*protected String getRoleId() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		return getUserInfo().getRole().getRoleType().toString();
-	}*/
-
-	/**
-	 * 当前登录用户信息
-	 */
-	/*protected User getUserInfo() {
-		if (getToken() == null) {
-			return null;
-		}
-		return remoteSecurityServer.loginAuthentication(getToken());
-	}*/
-	
-	 protected AgencyUserModel getUserInfo() {
-	    	AgencyUserModel userModel=null;
-	    	if(getToken()!=null){
-	    	RequestContext.setToken(getToken());
-	    	RequestContext.setProduct(getProduct());
-	    	RequestContext.setAppKey(getAppKey());
-	    	
-	    	FeignClientResult feignClientResult;
-			try {
-				feignClientResult = Privilege.agencyUserClient.getme();
-		    	 userModel = (AgencyUserModel) feignClientResult.getResult();
-
-			} catch (InnerInvokException e) {
-				e.printStackTrace();
-			}
-			
-	    	}
-	        return userModel;
-
-	       // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
-	    }
-	
-	 protected String getCompanyId(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getSequenceNbr().toString();
-	        }
-	        return null;
-	    }
-
-	protected String getDepartmentName(ReginParams reginParams) {
-		if (reginParams == null) {
-			return null;
-		}
-		if (reginParams.getDepartment() != null) {
-			return reginParams.getDepartment().getDepartmentName();
-		}
-		return null;
-	}
-
-	protected String getUserId() {
-		String userId = null;
-		if (getUserInfo() != null) {
-			userId = getUserInfo().getUserId();
-		}
-		return userId;
-	}
-
-	/**
-	 * 获取当前用户所属公司名称
-	 * 
-	 * @return
-	 */
-	protected String getCurrentCompanyNameOfUser() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		
-		return getSelectedOrgInfo().getCompany().getCompanyName();
-	}
+//	@Autowired
+//	protected HttpServletRequest request;
+//
+//	/**
+//	 * 成功返回状态
+//	 */
+//	protected static final String SUCCESS = "SUCCESS";
+//
+//	/**
+//	 * 失败返回状态
+//	 */
+//	protected static final String FAILED = "FAILED";
+//
+//	/**
+//	 * 默认页大小
+//	 */
+//	protected static final int DEFAULT_PAGE_SIZE = 10;
+//
+//	  @Autowired
+//	    private RedisTemplate<String, String> redisTemplate;
+//	  
+//	  
+//	protected String getToken() {
+//        String authToken = request.getHeader("token");
+//        if (authToken == null) {
+//            authToken = request.getHeader("X-Access-Token");
+//        }
+//        return authToken;
+//    }
+//    
+//    protected String getProduct() {
+//        String authToken = request.getHeader("product");
+//        if (authToken == null) {
+//            authToken = request.getParameter("product");
+//        }
+//        return authToken;
+//    }
+//
+//    
+//    protected String getAppKey() {
+//        String authToken = request.getHeader("appKey");
+//        if (authToken == null) {
+//            authToken = request.getParameter("appKey");
+//        }
+//        return authToken;
+//    }
+//	/**
+//	 * 
+//	 * <pre>
+//	 * 判断当前用户角色级别：true:主管/false:装备管理员
+//	 * </pre>
+//	 *
+//	 * @return
+//	 */
+//	/*protected boolean isDirector() {
+//		if (getUserInfo() == null) {
+//			return false;
+//		}
+//		return getUserInfo().getRole().getRoleType() != 3;
+//	}*/
+//
+//	/**
+//	 * 获取用户角色id
+//	 * 
+//	 * @return
+//	 */
+//	/*protected String getRoleId() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		return getUserInfo().getRole().getRoleType().toString();
+//	}*/
+//
+//	/**
+//	 * 当前登录用户信息
+//	 */
+//	/*protected User getUserInfo() {
+//		if (getToken() == null) {
+//			return null;
+//		}
+//		return remoteSecurityServer.loginAuthentication(getToken());
+//	}*/
+//	
+//	 protected AgencyUserModel getUserInfo() {
+//	    	AgencyUserModel userModel=null;
+//	    	if(getToken()!=null){
+//	    	RequestContext.setToken(getToken());
+//	    	RequestContext.setProduct(getProduct());
+//	    	RequestContext.setAppKey(getAppKey());
+//	    	
+//	    	FeignClientResult feignClientResult;
+//			try {
+//				feignClientResult = Privilege.agencyUserClient.getme();
+//		    	 userModel = (AgencyUserModel) feignClientResult.getResult();
+//
+//			} catch (InnerInvokException e) {
+//				e.printStackTrace();
+//			}
+//			
+//	    	}
+//	        return userModel;
+//
+//	       // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
+//	    }
+//	
+//	 protected String getCompanyId(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
+//	        }
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getSequenceNbr().toString();
+//	        }
+//	        return null;
+//	    }
+//
+//	protected String getDepartmentName(ReginParams reginParams) {
+//		if (reginParams == null) {
+//			return null;
+//		}
+//		if (reginParams.getDepartment() != null) {
+//			return reginParams.getDepartment().getDepartmentName();
+//		}
+//		return null;
+//	}
+//
+//	protected String getUserId() {
+//		String userId = null;
+//		if (getUserInfo() != null) {
+//			userId = getUserInfo().getUserId();
+//		}
+//		return userId;
+//	}
+//
+//	/**
+//	 * 获取当前用户所属公司名称
+//	 * 
+//	 * @return
+//	 */
+//	protected String getCurrentCompanyNameOfUser() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		
+//		return getSelectedOrgInfo().getCompany().getCompanyName();
+//	}
 
 	/*protected LoginUserParam getLoginUserParam() {
 		LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
@@ -200,70 +185,70 @@ public abstract class AbstractBaseController extends BaseController{
 	}*/
 
 	
-	   private String buildKey(String userId, String token) {
-	        //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
-	        return "region_" + userId + "_" + token;
-
-	    }
-
-	    protected void saveSelectedOrgInfo(ReginParams reginParams) {
-	        redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
-	    }
-
-	    protected ReginParams getSelectedOrgInfo() {
-	        return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
-	    }
+//	   private String buildKey(String userId, String token) {
+//	        //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
+//	        return "region_" + userId + "_" + token;
+//
+//	    }
+
+//	    protected void saveSelectedOrgInfo(ReginParams reginParams) {
+//	        redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
+//	    }
+
+//	    protected ReginParams getSelectedOrgInfo() {
+//	        return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
+//	    }
 	/**
 	 * 获取请求的cookies
 	 * 
 	 * @return
 	 */
-	protected HashMap<String, String> getCookInfoMap() {
-		HashMap<String, String> map = new HashMap<String, String>();
-		Cookie[] cookies = request.getCookies();
-		if (cookies != null) {
-			for (Cookie ck : cookies) {
-				map.put(ck.getName(), ck.getValue());
-			}
-		}
-		return map;
-	}
-	 protected String getCompanyName(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getCompanyName();
-	        }
-	        return null;
-	    }
-	
-	  protected String getLoginOrgCode(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-//	        if (reginParams.getDepartment() != null) {
-//	            return reginParams.getDepartment().getDeptOrgCode();
+//	protected HashMap<String, String> getCookInfoMap() {
+//		HashMap<String, String> map = new HashMap<String, String>();
+//		Cookie[] cookies = request.getCookies();
+//		if (cookies != null) {
+//			for (Cookie ck : cookies) {
+//				map.put(ck.getName(), ck.getValue());
+//			}
+//		}
+//		return map;
+//	}
+//	 protected String getCompanyName(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
 //	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getOrgCode();
-	        }
-	        return null;
-	    }
-	  
-	  
-	/**
-	 * 获取公司orgcode
-	 * 
-	 * @return
-	 *//*
-	protected String getOrgCode() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		return getUserInfo().getCompanys().getCompCode();
-	}*/
-
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getCompanyName();
+//	        }
+//	        return null;
+//	    }
+//	
+//	  protected String getLoginOrgCode(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
+//	        }
+////	        if (reginParams.getDepartment() != null) {
+////	            return reginParams.getDepartment().getDeptOrgCode();
+////	        }
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getOrgCode();
+//	        }
+//	        return null;
+//	    }
+//	  
+//	  
+//	/**
+//	 * 获取公司orgcode
+//	 * 
+//	 * @return
+//	 *//*
+//	protected String getOrgCode() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		return getUserInfo().getCompanys().getCompCode();
+//	}*/
+//
 	/**
 	 * 生成查询条件
 	 * 
@@ -331,90 +316,90 @@ public abstract class AbstractBaseController extends BaseController{
         return daoCriterias;
 
     }
-/*	public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
-		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
-		String orgCode = null;
-		if (queryRequests != null && !queryRequests.isEmpty()) {
-			for (CommonRequest query : queryRequests) {
-				DaoCriteria criteria = new DaoCriteria();
-				if (StringUtil.isNotEmpty(query.getValue())) {
-					if (query.getValue().toString().equals("-0")) {
-						criteria.setPropertyName(query.getName());
-						criteria.setOperator(QueryOperatorEnum.IS.getName());
-						criteria.setValue(null);
-					} else {
-						criteria.setPropertyName(query.getName());
-						String column = criteria.getPropertyName();
-						if (!(query.getValue() instanceof Collection<?>)
-								&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
-							criteria.setValue(Long.valueOf(query.getValue().toString()));
-						} else {
-							criteria.setValue(query.getValue());
-						}
-
-						String operator = query.getType();
-						if (!StringUtil.isNotEmpty(operator)) {
-							criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-						} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
-							setLikeCriteria(criteria, query);
-						} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else if (QueryOperatorEnum.getEnum(operator) != null) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else {
-							criteria.setOperator(operator);
-						}
-					}
-					daoCriterias.add(criteria);
-				}
-			}
-		}
-		if (flag) {
-			ReginParams param = getSelectedOrgInfo();
-			if (param == null) {
-				throw new YeeException("非法请求");
-			}
-			String roleTypeName = param.getRole().getRoleName();
-			if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
-					|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-				orgCode = param.getCompany().getOrgCode();
-				daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
-			} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-				orgCode = param.getUserOrgCode();
-				daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
-			} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-				DaoCriteria compDaoCriteria = new DaoCriteria();
-				compDaoCriteria.setPropertyName("userId");
-				compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-				compDaoCriteria.setValue(param.);
-				daoCriterias.add(compDaoCriteria);
-			}
-
-		}
-		return daoCriterias;
-
-	}*/
-    protected String getRoleTypeName(ReginParams reginParams) {
-        if (reginParams == null) {
-            return null;
-        }
-        if (reginParams.getRole() != null) {
-            return reginParams.getRole().getRoleType();
-        }
-        return null;
-    }
-    protected String getDepartmentId(ReginParams reginParams) {
-        if (reginParams == null) {
-            return null;
-        }
-        if (reginParams.getDepartment() != null) {
-            return reginParams.getDepartment().getSequenceNbr().toString();
-        }
-        return null;
-    }
-
+///*	public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
+//		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
+//		String orgCode = null;
+//		if (queryRequests != null && !queryRequests.isEmpty()) {
+//			for (CommonRequest query : queryRequests) {
+//				DaoCriteria criteria = new DaoCriteria();
+//				if (StringUtil.isNotEmpty(query.getValue())) {
+//					if (query.getValue().toString().equals("-0")) {
+//						criteria.setPropertyName(query.getName());
+//						criteria.setOperator(QueryOperatorEnum.IS.getName());
+//						criteria.setValue(null);
+//					} else {
+//						criteria.setPropertyName(query.getName());
+//						String column = criteria.getPropertyName();
+//						if (!(query.getValue() instanceof Collection<?>)
+//								&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
+//							criteria.setValue(Long.valueOf(query.getValue().toString()));
+//						} else {
+//							criteria.setValue(query.getValue());
+//						}
+//
+//						String operator = query.getType();
+//						if (!StringUtil.isNotEmpty(operator)) {
+//							criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//						} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
+//							setLikeCriteria(criteria, query);
+//						} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else if (QueryOperatorEnum.getEnum(operator) != null) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else {
+//							criteria.setOperator(operator);
+//						}
+//					}
+//					daoCriterias.add(criteria);
+//				}
+//			}
+//		}
+//		if (flag) {
+//			ReginParams param = getSelectedOrgInfo();
+//			if (param == null) {
+//				throw new YeeException("非法请求");
+//			}
+//			String roleTypeName = param.getRole().getRoleName();
+//			if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
+//					|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//				orgCode = param.getCompany().getOrgCode();
+//				daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
+//			} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//				orgCode = param.getUserOrgCode();
+//				daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
+//			} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//				DaoCriteria compDaoCriteria = new DaoCriteria();
+//				compDaoCriteria.setPropertyName("userId");
+//				compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//				compDaoCriteria.setValue(param.);
+//				daoCriterias.add(compDaoCriteria);
+//			}
+//
+//		}
+//		return daoCriterias;
+//
+//	}*/
+//    protected String getRoleTypeName(ReginParams reginParams) {
+//        if (reginParams == null) {
+//            return null;
+//        }
+//        if (reginParams.getRole() != null) {
+//            return reginParams.getRole().getRoleType();
+//        }
+//        return null;
+//    }
+//    protected String getDepartmentId(ReginParams reginParams) {
+//        if (reginParams == null) {
+//            return null;
+//        }
+//        if (reginParams.getDepartment() != null) {
+//            return reginParams.getDepartment().getSequenceNbr().toString();
+//        }
+//        return null;
+//    }
+//
 	/**
 	 * 构建数据权限 返回字段：orgCode(机构)，expression（表达式）
 	 * 
@@ -434,30 +419,30 @@ public abstract class AbstractBaseController extends BaseController{
         }
         return paramMap;
     }
-	/*public HashMap<String, Object> buildMybatisDaoCriterias() {
-		String orgCode = null;
-		LoginUserParam param = getLoginUserParam();
-		if (param == null) {
-			throw new YeeException("非法请求");
-		}
-		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		String roleTypeName = param.getRoleTypeName();
-
-		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-			orgCode = param.getLoginOrgCode();
-			paramMap.put("orgCode", orgCode + "%");
-			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
-		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-			orgCode = param.getUserOrgCode();
-			paramMap.put("orgCode", orgCode + "%");
-			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
-		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-			paramMap.put("userId", param.getUserId());
-			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
-		}
-		return paramMap;
-
-	}*/
+//	/*public HashMap<String, Object> buildMybatisDaoCriterias() {
+//		String orgCode = null;
+//		LoginUserParam param = getLoginUserParam();
+//		if (param == null) {
+//			throw new YeeException("非法请求");
+//		}
+//		HashMap<String, Object> paramMap = new HashMap<String, Object>();
+//		String roleTypeName = param.getRoleTypeName();
+//
+//		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//			orgCode = param.getLoginOrgCode();
+//			paramMap.put("orgCode", orgCode + "%");
+//			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
+//		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//			orgCode = param.getUserOrgCode();
+//			paramMap.put("orgCode", orgCode + "%");
+//			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
+//		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//			paramMap.put("userId", param.getUserId());
+//			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
+//		}
+//		return paramMap;
+//
+//	}*/
     public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) {
         HashMap<String, Object> paramMap = new HashMap<>();
         if(StringUtil.isNotEmpty(roleTypeName)){
@@ -478,48 +463,48 @@ public abstract class AbstractBaseController extends BaseController{
         return paramMap;
 
     }
-	
-	/*public HashMap<String, Object> buildMybatisCriterias() {
-		String orgCode = null;
-		LoginUserParam param = getLoginUserParam();
-		if (param == null) {
-			throw new YeeException("非法请求");
-		}
-		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		String roleTypeName = param.getRoleTypeName();
-
-		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-			orgCode = param.getLoginOrgCode();
-			paramMap.put("orgCode", orgCode);
-			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
-		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-			orgCode = param.getUserOrgCode();
-			paramMap.put("orgCode", orgCode);
-			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
-		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-			paramMap.put("userId", param.getUserId());
-			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
-		}
-		return paramMap;
-
-	}*/
-
-	/**
-	 * 暂时未用到
-	 * 
-	 * @return
-	 */
-/*	public List<DaoCriteria> buildDaoCriteriasNoParam() {
-		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
-		String orgCode = getOrgCode();
-		if (isDirector()) {
-			daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
-		} else {
-			daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
-		}
-		return daoCriterias;
-	}*/
-
+//	
+//	/*public HashMap<String, Object> buildMybatisCriterias() {
+//		String orgCode = null;
+//		LoginUserParam param = getLoginUserParam();
+//		if (param == null) {
+//			throw new YeeException("非法请求");
+//		}
+//		HashMap<String, Object> paramMap = new HashMap<String, Object>();
+//		String roleTypeName = param.getRoleTypeName();
+//
+//		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//			orgCode = param.getLoginOrgCode();
+//			paramMap.put("orgCode", orgCode);
+//			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
+//		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//			orgCode = param.getUserOrgCode();
+//			paramMap.put("orgCode", orgCode);
+//			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
+//		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//			paramMap.put("userId", param.getUserId());
+//			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
+//		}
+//		return paramMap;
+//
+//	}*/
+//
+//	/**
+//	 * 暂时未用到
+//	 * 
+//	 * @return
+//	 */
+///*	public List<DaoCriteria> buildDaoCriteriasNoParam() {
+//		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
+//		String orgCode = getOrgCode();
+//		if (isDirector()) {
+//			daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
+//		} else {
+//			daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
+//		}
+//		return daoCriterias;
+//	}*/
+    
 	/**
 	 * 
 	 * <pre>
@@ -548,29 +533,29 @@ public abstract class AbstractBaseController extends BaseController{
 		return daoCriterias;
 	}
 
-	/**
-	 * 
-	 * <pre>
-	 * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
-	 * </pre>
-	 *
-	 * @param daoCriterias
-	 *            查询条件集合
-	 * @param orgCode
-	 * @return
-	 */
-	public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
-		/**
-		 * 当前用户所属公司
-		 */
-
-		DaoCriteria compDaoCriteria = new DaoCriteria();
-		compDaoCriteria.setPropertyName("orgCode");
-		compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-		compDaoCriteria.setValue(orgCode);
-		daoCriterias.add(compDaoCriteria);
-		return daoCriterias;
-	}
+//	/**
+//	 * 
+//	 * <pre>
+//	 * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
+//	 * </pre>
+//	 *
+//	 * @param daoCriterias
+//	 *            查询条件集合
+//	 * @param orgCode
+//	 * @return
+//	 */
+//	public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
+//		/**
+//		 * 当前用户所属公司
+//		 */
+//
+//		DaoCriteria compDaoCriteria = new DaoCriteria();
+//		compDaoCriteria.setPropertyName("orgCode");
+//		compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//		compDaoCriteria.setValue(orgCode);
+//		daoCriterias.add(compDaoCriteria);
+//		return daoCriterias;
+//	}
 
 	/**
 	 * 对like查询语句的内容进行特殊字符转义
@@ -600,43 +585,43 @@ public abstract class AbstractBaseController extends BaseController{
 		}
 	}
 
-	/**
-	 * <pre>
-	 * 提取错误异常中的错误消息
-	 * </pre>
-	 * 
-	 * <p>
-	 * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
-	 * 提取出异常信息NotNull(message = "属性不能为空！")
-	 * </p>
-	 * 
-	 * @see {@code NotBlank} ... NotNull、NotEmpty...
-	 * @see {@code Valid}
-	 * 
-	 * @param e
-	 * @return
-	 */
-	public String getErrorMessage(Exception e) {
-		StringBuilder message = new StringBuilder();
-		if (e instanceof TransactionSystemException) {
-			TransactionSystemException exception = (TransactionSystemException) e;
-			if (exception.getRootCause() instanceof ConstraintViolationException) {
-				ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
-				root.getConstraintViolations().forEach(constraintViolation -> {
-					message.append(constraintViolation.getMessageTemplate());
-				});
-			} else {
-				message.append(e.getMessage());
-			}
-		} else if (e instanceof ConstraintViolationException) {
-			((ConstraintViolationException) e).getConstraintViolations()
-					.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
-		} else {
-			message.append("操作异常！");
-		}
-		return message.toString();
-	}
-	
+//	/**
+//	 * <pre>
+//	 * 提取错误异常中的错误消息
+//	 * </pre>
+//	 * 
+//	 * <p>
+//	 * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
+//	 * 提取出异常信息NotNull(message = "属性不能为空！")
+//	 * </p>
+//	 * 
+//	 * @see {@code NotBlank} ... NotNull、NotEmpty...
+//	 * @see {@code Valid}
+//	 * 
+//	 * @param e
+//	 * @return
+//	 */
+//	public String getErrorMessage(Exception e) {
+//		StringBuilder message = new StringBuilder();
+//		if (e instanceof TransactionSystemException) {
+//			TransactionSystemException exception = (TransactionSystemException) e;
+//			if (exception.getRootCause() instanceof ConstraintViolationException) {
+//				ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
+//				root.getConstraintViolations().forEach(constraintViolation -> {
+//					message.append(constraintViolation.getMessageTemplate());
+//				});
+//			} else {
+//				message.append(e.getMessage());
+//			}
+//		} else if (e instanceof ConstraintViolationException) {
+//			((ConstraintViolationException) e).getConstraintViolations()
+//					.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
+//		} else {
+//			message.append("操作异常！");
+//		}
+//		return message.toString();
+//	}
+//	
     public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
   	  List<Map<String, Object>> list = Lists.newArrayList();
   	  if (objList != null && objList.size() > 0) {
@@ -668,9 +653,4 @@ public abstract class AbstractBaseController extends BaseController{
   	  return map;
   	}
 
-  	public void buildRequestCxt(){
-		RequestContext.setToken(getToken());
-		RequestContext.setProduct(getProduct());
-		RequestContext.setAppKey(getAppKey());
-	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CatalogTreeController.java

@@ -48,7 +48,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse getCatalogTree() {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		List<Object> list  = catalogTreeService.getCatalogTree(orgCode);
 		return CommonResponseUtil.success(list);
 	}
@@ -63,7 +63,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse getCatalogList() {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		List<CatalogTree> list  = catalogTreeService.getCatalogList(orgCode);
 		return CommonResponseUtil.success(list);
 	}
@@ -80,7 +80,7 @@ public class CatalogTreeController extends AbstractBaseController {
 		try {
 			 String userId = getUserId();
 	            ReginParams reginParams = getSelectedOrgInfo();
-	            String orgCode = getLoginOrgCode(reginParams);
+	            String orgCode = getOrgCode(reginParams);
 			HashMap<String,Object> map = new HashMap<String,Object>();
 			map.put("org_code", orgCode);
 			map.put("user_id", userId);
@@ -151,7 +151,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		HashMap<String,Object> paramMap = new HashMap<String,Object>();
 		paramMap.put("orgCode",orgCode);
 		CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -123,7 +123,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         boolean hasOrgCode = Boolean.TRUE;
         String roleTypeName = getRoleTypeName(reginParams);
         if (0 < queryRequests.size()) {
@@ -155,7 +155,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             HttpServletResponse response) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         boolean hasOrgCode = Boolean.TRUE;
         if (0 < queryRequests.size()) {
@@ -205,7 +205,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             HttpServletResponse response) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         boolean hasOrgCode = Boolean.TRUE;
         if (0 < queryRequests.size()) {
@@ -289,7 +289,7 @@ public class CheckController extends AbstractBaseController {
             int count = checkService.checkHasRecord(requestParam);
             if (count < 1 || requestParam.getPlanTaskId() < 1) {
                 ReginParams reginParams = getSelectedOrgInfo();
-                String orgCode = getLoginOrgCode(reginParams);
+                String orgCode = getOrgCode(reginParams);
                 String departmentId = getDepartmentId(reginParams);
                 requestParam.setOrgCode(orgCode);
                 requestParam.setUserId(getUserId());
@@ -423,7 +423,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
 
@@ -443,7 +443,7 @@ public class CheckController extends AbstractBaseController {
     public CommonResponse queryRecordByPointId(
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         String departmentId = getDepartmentId(reginParams);
         HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests);
@@ -518,7 +518,7 @@ public class CheckController extends AbstractBaseController {
             if (htmlFile.exists()) {
                 htmlFile.delete();
             }
-            return new CommonResponse(SUCCESS, data, "查询成功");
+            return new CommonResponse("SUCCESS", data, "查询成功");
         } catch (TransformerException | IOException e) {
             e.printStackTrace();
             return null;
@@ -551,7 +551,7 @@ public class CheckController extends AbstractBaseController {
     public CommonResponse getCheckStatisticalAnalysis(
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         queryRequests.setOrgCode(loginOrgCode);
         List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests);
         return CommonResponseUtil.success(list);
@@ -565,7 +565,7 @@ public class CheckController extends AbstractBaseController {
             HttpServletResponse response) {
         String userId = getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         queryRequests.setOrgCode(loginOrgCode);
         List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(), getProduct(), getAppKey(), queryRequests);
         String fileName = "巡检记录" + new Date().getTime();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/EquipmentRuleController.java

@@ -52,7 +52,7 @@ public class EquipmentRuleController extends AbstractBaseController {
         token.setToke(getToken());
         token.setAppKey(getAppKey());
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         map.put("orgCode", orgCode);
         equipmentHandlerService.fireEquipRuleMessagePush(map, token);
         return CommonResponseUtil.success();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/ExcelExportController.java

@@ -72,7 +72,7 @@ public class ExcelExportController extends AbstractBaseController{
 		startDate 	+= " 00:00:00";
 		endDate 	+= " 23:59:59";
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		Map<String,Object> map 	=  taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode);
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/HomeController.java

@@ -55,11 +55,11 @@ public class HomeController extends AbstractBaseController{
 		HashMap<String, Object> response = new HashMap<String, Object>();
 		HashMap<String, Object> statusList = new HashMap<String, Object>();
 		    ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String companyName = getCompanyName(reginParams);
 		/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
 				XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
-			orgCode = loginParam.getLoginOrgCode();
+			orgCode = loginParam.getOrgCode();
 		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
 			orgCode = loginParam.getUserOrgCode();
 		}*/
@@ -90,7 +90,7 @@ public class HomeController extends AbstractBaseController{
 	public CommonResponse getCheckData() {
 		   String userId = getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 		SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -107,7 +107,7 @@ public class HomeController extends AbstractBaseController{
 		HashMap<String, Object> param = new HashMap<String, Object>();
 		/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
 				XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
-			param.put("orgCode", loginParam.getLoginOrgCode());
+			param.put("orgCode", loginParam.getOrgCode());
 		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
 			param.put("orgCode", loginParam.getUserOrgCode());
 		} else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/InputItemController.java

@@ -92,7 +92,7 @@ public class InputItemController extends AbstractBaseController {
         try {
             InputItem inputItem = new InputItem();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             BeanUtils.copyProperties(param, inputItem);
             inputItem.setOrgCode(loginOrgCode);
             inputItem.setCreateBy(user.getUserId());
@@ -224,7 +224,7 @@ public class InputItemController extends AbstractBaseController {
             @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = new HashMap<String, Object>();
         paramMap.put("orgCode", loginOrgCode);
         InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
@@ -245,7 +245,7 @@ public class InputItemController extends AbstractBaseController {
             @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
         // 1.组织查询条件数据
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, null);
         // 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
         DaoCriteria compDaoCriteria = new DaoCriteria();
@@ -268,7 +268,7 @@ public class InputItemController extends AbstractBaseController {
     @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
     public CommonResponse queryCustomInputItem(@RequestBody HashMap<String, Object> params) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params, orgCode);
         return CommonResponseUtil.success(list);
     }
@@ -286,7 +286,7 @@ public class InputItemController extends AbstractBaseController {
             @ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
         // 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         List<InputItem> list = null;
         if (ObjectUtils.isEmpty(queryRequests)) {
             list = inputItemDao.findAllByLevel(loginOrgCode);
@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController {
             @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId,
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -396,7 +396,7 @@ public class InputItemController extends AbstractBaseController {
             throw new Exception("请使用指定模板进行上传");
         }
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String userId = getUserId();
         List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class);
         return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId));

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/LatentDangerController.java

@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController {
             }
 
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = getDepartmentId(reginParams);
             String companyId = getCompanyId(reginParams);
             String departmentName = getDepartmentName(reginParams);
@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController {
                 return CommonResponseUtil.failure("用户session过期");
             }
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = getDepartmentId(reginParams);
             String companyId = getCompanyId(reginParams);
             String departmentName = getDepartmentName(reginParams);
@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController {
                 return CommonResponseUtil.failure("用户session过期");
             }
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = null;
             return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId);
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/MsgController.java

@@ -99,7 +99,7 @@ public class MsgController extends AbstractBaseController {
 			AgencyUserModel userModel = getUserInfo();
         String userId = userModel.getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
 		String deptId=null;
 		if( reginParams.getDepartment()!=null){
 			deptId = reginParams.getDepartment().getDepartmentDesc();
@@ -190,7 +190,7 @@ public class MsgController extends AbstractBaseController {
 			AgencyUserModel userModel = getUserInfo();
 	        String userId = userModel.getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 			for (MsgSubscribe s: subscribe) {
 				s.setOrgCode(orgCode);
 				s.setUserId(userModel.getUserId());
@@ -299,7 +299,7 @@ public class MsgController extends AbstractBaseController {
 			
 			AgencyUserModel user = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
 			CommonRequest request = new CommonRequest();
 			CommonRequest request1 = new CommonRequest();
@@ -367,7 +367,7 @@ public class MsgController extends AbstractBaseController {
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		try {
 			  ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 	            String roleTypeName = getRoleTypeName(reginParams);
 	            HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 	         if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName))
@@ -414,7 +414,7 @@ public class MsgController extends AbstractBaseController {
             msg.setCreateBy(user.getUserId());
             ReginParams reginParams = getSelectedOrgInfo();
             msg.setUserName(user.getRealName());
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             msg.setOrgCode(loginOrgCode);
             List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg);
 			msgList.forEach(m->{

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanController.java

@@ -50,9 +50,9 @@ public class PlanController extends AbstractBaseController {
     public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
                                            @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
-        buildRequestCxt();
+//        buildRequestCxt();
         PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
         Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
         return CommonResponseUtil.success(list);
@@ -71,7 +71,7 @@ public class PlanController extends AbstractBaseController {
     public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
                                            @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         HashMap<String, Object> paramMap = buildMybatisCriterias(null, null);
-        buildRequestCxt();
+//        buildRequestCxt();
         PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
         Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
         return CommonResponseUtil.success(list);
@@ -90,7 +90,7 @@ public class PlanController extends AbstractBaseController {
         try {
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             HashMap<String, Object> map = new HashMap<String, Object>();
             map.put("org_code", loginOrgCode);
             map.put("user_id", userId);
@@ -171,7 +171,7 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
         PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
         List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
@@ -183,7 +183,7 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPlanList() {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
         return CommonResponseUtil.success(list);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -90,7 +90,7 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
         PlanTaskPageParam params = new PlanTaskPageParam();
         PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, commonPageable, params, paramMap);
@@ -183,7 +183,7 @@ public class PlanTaskController extends AbstractBaseController {
             HttpServletResponse response) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, null);
             PlanTaskPageParam params = new PlanTaskPageParam();
             PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, null, params, paramMap);
@@ -261,7 +261,7 @@ public class PlanTaskController extends AbstractBaseController {
         try {
             HashMap<String, Object> params = new HashMap<String, Object>();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             params.put("orgCode", loginOrgCode);
             String pointNo = serial;
             params.put("pointNo", pointNo);
@@ -502,7 +502,7 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int size) throws Exception {
         HashMap<String, Object> params = new HashMap<String, Object>();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
         params.putAll(authMap);
         params.put("companyId", companyId);
@@ -550,7 +550,7 @@ public class PlanTaskController extends AbstractBaseController {
         HashMap<String, Object> params = new HashMap<String, Object>();
         HashMap<String, Object> resp = new HashMap<String, Object>();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
         params.put("userId", getUserId());
         if (queryRequests != null && queryRequests.size() > 0) {
@@ -635,7 +635,7 @@ public class PlanTaskController extends AbstractBaseController {
     public CommonResponse queryLeavePlanTask() {
         String userId = getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("userId", userId);
         params.put("orgCode", loginOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PointController.java

@@ -92,7 +92,7 @@ public class PointController extends AbstractBaseController {
         }
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             //点归属于公司
             pointParam.getPoint().setOrgCode(loginOrgCode);
             pointParam.getPoint().setCreatorId(user.getUserId());
@@ -115,7 +115,7 @@ public class PointController extends AbstractBaseController {
         }
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             //点归属于公司
             param.setOrgCode(loginOrgCode);
             param.setCreatorId(user.getUserId());
@@ -226,7 +226,7 @@ public class PointController extends AbstractBaseController {
             @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -279,7 +279,7 @@ public class PointController extends AbstractBaseController {
     public CommonResponse listAllPoint() {
         List<CommonRequest> queryRequests = new ArrayList<>();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         CommonRequest commonRequest = new CommonRequest();
         commonRequest.setName("orgCode");
         commonRequest.setValue(loginOrgCode);
@@ -304,7 +304,7 @@ public class PointController extends AbstractBaseController {
         }
         String userId = getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -324,7 +324,7 @@ public class PointController extends AbstractBaseController {
     public CommonResponse exportTemplate(HttpServletResponse response) {
         String userId = getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String fileName = "巡检点导入模板"; //模板名称
         String[] handers = {"点编号", "点名称", "是否为移动点", "计划外巡检是否评分", "是否允许离线巡检", "参考地址", "3维地图坐标", "3维地图楼层", "最少拍照数量", "最多拍照数量", "风险等级", "备注说明", "所属分类目录", "检查项目", "是否室内"}; //列标题
         List<String[]> downData = new ArrayList();
@@ -357,7 +357,7 @@ public class PointController extends AbstractBaseController {
                                           @RequestParam(value = "exportType", required = false) int exportType,
                                           HttpServletResponse response) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -384,7 +384,7 @@ public class PointController extends AbstractBaseController {
                                                @RequestParam(value = "exportType", required = false) int exportType,
                                                HttpServletResponse response) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -414,7 +414,7 @@ public class PointController extends AbstractBaseController {
             @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -438,7 +438,7 @@ public class PointController extends AbstractBaseController {
     public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids,
                                     @ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         try {
             List<Point> list = iPointService.queryPointList(ids, names, orgCode);
             return CommonResponseUtil.success(list);
@@ -460,7 +460,7 @@ public class PointController extends AbstractBaseController {
     public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code,
                                       @ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         try {
             List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode);
             return CommonResponseUtil.success(list);
@@ -621,7 +621,7 @@ public class PointController extends AbstractBaseController {
     @GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8")
     public CommonResponse queryPointPie() {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("orgCode", loginOrgCode);
         HashMap<String, Object> response = iPointService.queryPointPie(params);
@@ -633,7 +633,7 @@ public class PointController extends AbstractBaseController {
     @GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8")
     public CommonResponse queryPointHistogram() {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("orgCode", loginOrgCode);
         List<HashMap<String, Object>> response = iPointService.queryPointHistogram(params);
@@ -682,7 +682,7 @@ public class PointController extends AbstractBaseController {
             @ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId,
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -714,7 +714,7 @@ public class PointController extends AbstractBaseController {
     @GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8")
     public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required = false) String startTime) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         if (ObjectUtils.isEmpty(reginParams)) {
             return CommonResponseUtil.failure("用户session过期");
         }
@@ -742,7 +742,7 @@ public class PointController extends AbstractBaseController {
     @PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8")
     public CommonResponse exportIecPoint(HttpServletResponse response) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String fileName = "巡检点点位"; //模板名称
         List<Map<String, Object>> list = iPointService.queryAllPointConfig(loginOrgCode);
         try {
@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController {
             @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
         ReginParams reginParams = getSelectedOrgInfo();
         AgencyUserModel model = getUserInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         iPointService.syncSavePoint(list, orgCode, model.getUserId());
         return CommonResponseUtil.success();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/QueryStatsController.java

@@ -47,7 +47,7 @@ public class QueryStatsController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/RouteController.java

@@ -63,7 +63,7 @@ public class RouteController extends AbstractBaseController {
     public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             route.setOrgCode(loginOrgCode);
             route.setIsDelete(false);
             if (routeService.existRouteName(loginOrgCode, route.getName())) {
@@ -90,7 +90,7 @@ public class RouteController extends AbstractBaseController {
     public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
             route.setOrgCode(orgCode);
             route.setCreatorId(getUserId());
             routeService.updateRoute(route);
@@ -195,7 +195,7 @@ public class RouteController extends AbstractBaseController {
             @ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             HashMap<String, Object> paramMap = new HashMap<String, Object>();
             paramMap.put("orgCode", loginOrgCode);
             RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap);
@@ -214,7 +214,7 @@ public class RouteController extends AbstractBaseController {
         try {
             //1.组织数据权限信息
             ReginParams reginParams = getSelectedOrgInfo();
-            String org = getLoginOrgCode(reginParams);
+            String org = getOrgCode(reginParams);
             //2.查询
             List<Route> routeList;
             if (null != orgCode && 0 == orgCode) {
@@ -235,7 +235,7 @@ public class RouteController extends AbstractBaseController {
     public CommonResponse queryRouteList() {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode, null, null);
             routeList = routeList.stream().distinct().collect(Collectors.toList());
             return CommonResponseUtil.success(routeList);
@@ -293,7 +293,7 @@ public class RouteController extends AbstractBaseController {
         try {
             String uid = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             List<RoutePoint> routePointList = new ArrayList<>();
             for (String pointId : pointIds) {
                 RoutePoint routePoint = new RoutePoint();

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SafetyController.java

@@ -62,7 +62,7 @@ public class SafetyController extends AbstractBaseController{
     @ApiOperation(value = "  保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
     @PostMapping(value = "/save/curCompany")
     public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
-        this.saveSelectedOrgInfo(reginParams);
+//        this.saveSelectedOrgInfo(reginParams);
         // CatalogTree  hh4= new CatalogTree();
        // CommonResponse  hh= pointService.pushSpcCheckResult(hh4);
         

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SafetyPreCtrlController.java

@@ -77,7 +77,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse sumCheckPtById() {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
         List<HashMap<String, Object>> List = pointService.getSumPtByRole(paramMap);
@@ -95,7 +95,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
         List<HashMap<String, Object>> countList = checkService.getCountMonthChkByRole(paramMap, dateMonth);
@@ -114,7 +114,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
                                         @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
         CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests, commonPageable, paramMap);
@@ -132,7 +132,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse getQueryCriteriaInit() {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         String departmentId = getDepartmentId(reginParams);
         String companyId = getCompanyId(reginParams);
@@ -153,7 +153,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String, Object> map) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
         paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6));
@@ -173,7 +173,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
         List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap);
@@ -193,7 +193,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
                                            @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
         CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap);
@@ -214,14 +214,14 @@ public class SafetyPreCtrlController extends AbstractBaseController {
         CommonPage<CheckInputBo> checkInputBos = null;
         try {
             checkInputBos = checkService.getCheckInputByCheckId(param);
-            checkInputBos.setResult(SUCCESS);
+            checkInputBos.setResult("SUCCESS");
         } catch (Exception e) {
             e.printStackTrace();
             if (ObjectUtils.isEmpty(checkInputBos)) {
                 checkInputBos = new CommonPage(null, null, 0);
             }
             checkInputBos.setMessage(e.getMessage());
-            checkInputBos.setResult(FAILED);
+            checkInputBos.setResult("FAILED");
         }
         return CommonResponseUtil.success(checkInputBos);
     }
@@ -280,7 +280,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
             @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数") CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
         CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap);
         Page<CheckPtListBo> checkPtListBo = pointService.getCheckPtList(getToken(), getProduct(), getAppKey(), params);
@@ -389,7 +389,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
             CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap);
@@ -412,7 +412,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
         CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, null, paramMap);
@@ -425,7 +425,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
     @RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse findCheckSystemInit(@ApiParam(value = "类型", required = true) @PathVariable String type) {
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         String departmentId = getDepartmentId(reginParams);
         String companyId = getCompanyId(reginParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SynDataController.java

@@ -54,7 +54,7 @@ public class SynDataController extends AbstractBaseController {
                                     @ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) {
         try {
         	ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
             String userId = getUserId();
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
@@ -86,7 +86,7 @@ public class SynDataController extends AbstractBaseController {
         try {
             if (operationType.equals(saveOperationType)) {
             	ReginParams reginParams = getSelectedOrgInfo();
-                String orgCode = getLoginOrgCode(reginParams);
+                String orgCode = getOrgCode(reginParams);
                 String userId = getUserId();
                 if (ObjectUtils.isEmpty(reginParams)) {
                     return CommonResponseUtil.failure("用户session过期");
@@ -143,12 +143,12 @@ public class SynDataController extends AbstractBaseController {
                                 @ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) {
         try {
         	 ReginParams reginParams = getSelectedOrgInfo();
-             String orgCode = getLoginOrgCode(reginParams);
+             String orgCode = getOrgCode(reginParams);
              String userId = getUserId();
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
             }
-           // String orgCode = getLoginUserParam().getLoginOrgCode();
+           // String orgCode = getLoginUserParam().getOrgCode();
             if (operationType.equals(saveOperationType)) {
                 return iSynDataService.saveRoute(synRouteParam, userId, orgCode);
             }
@@ -172,7 +172,7 @@ public class SynDataController extends AbstractBaseController {
                                @ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) {
         try {
         	 ReginParams reginParams = getSelectedOrgInfo();
-             String orgCode = getLoginOrgCode(reginParams);
+             String orgCode = getOrgCode(reginParams);
              String userId = getUserId();
             Toke toke = new Toke();
             toke.setAppKey(getAppKey());
@@ -181,7 +181,7 @@ public class SynDataController extends AbstractBaseController {
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
             }
-           // String orgCode = getLoginUserParam().getLoginOrgCode();
+           // String orgCode = getLoginUserParam().getOrgCode();
             if (operationType.equals(saveOperationType)) {
                 return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/TaskController.java

@@ -123,7 +123,7 @@ public class TaskController extends AbstractBaseController{
 				return CommonResponseUtil.failure("完成时间应当大于当前时间！" );
 			}
 			ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
 			param.getTaskInfo().setOrgCode(orgCode);
 //			param.getTaskInfo().setCreateDate(new Date());
 			param.getTaskInfo().setPublisher(user.getUserId());
@@ -239,7 +239,7 @@ public class TaskController extends AbstractBaseController{
 			if (htmlFile.exists()) {
 				htmlFile.delete();
 			}
-			return new CommonResponse(SUCCESS, data, "查询成功");
+			return new CommonResponse("SUCCESS", data, "查询成功");
 		 } catch (TransformerException | IOException e) {
 			e.printStackTrace();
 			return null;
@@ -296,7 +296,7 @@ public class TaskController extends AbstractBaseController{
 		try {
 			AgencyUserModel user = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
 			taskService.handleTask(taskIds, status, user, orgCode);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
@@ -352,7 +352,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) {
 		AgencyUserModel user = getUserInfo();
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(user)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -441,7 +441,7 @@ public class TaskController extends AbstractBaseController{
 			@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
 		try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             String deptId ="";
 			String userId ="";
@@ -480,7 +480,7 @@ public class TaskController extends AbstractBaseController{
 			queryRequests = new ArrayList<>();
 		}
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
 		List<Task> list = taskService.queryTaskByCondition(criterias);
@@ -501,7 +501,7 @@ public class TaskController extends AbstractBaseController{
 			queryRequests = new ArrayList<>();
 		}
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
 		int count = taskService.queryTaskCountByCondition(criterias);
@@ -513,7 +513,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)")
 	public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		if (queryRequests == null) {
@@ -563,7 +563,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
 				@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		if (queryRequests == null) {
@@ -618,7 +618,7 @@ public class TaskController extends AbstractBaseController{
 	@RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse getQueryCriteriaInit(){
 		ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
@@ -660,7 +660,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) {
 		HashMap<String,Object> params = new HashMap<String,Object>();
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) ||
 	                XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
@@ -707,7 +707,7 @@ public class TaskController extends AbstractBaseController{
 		HashMap<String,Object> params = new HashMap<String,Object>();		HashMap<String,Object> resp = new HashMap<String,Object>();
 		 AgencyUserModel user = getUserInfo();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		params.put("orgCode",orgCode);
@@ -740,7 +740,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "查询任务统计", notes = "查询任务统计")
 	public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		param.setOrgCode(orgCode);
 		List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
 	      if (list!=null&&list.size()>0){
@@ -793,7 +793,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "查询任务统计", notes = "查询任务统计")
 	public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) {
 		   ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		param.setOrgCode(orgCode);
 		List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
 		 if (list!=null&&list.size()>0){

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/TaskReportController.java

@@ -48,7 +48,7 @@ public class TaskReportController extends AbstractBaseController{
 		startDate += " 00:00:00";
 		endDate += " 23:59:59";
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode));
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/UserController.java

@@ -186,7 +186,7 @@ public class UserController extends AbstractBaseController {
         CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString());
         List children = (List) companyModel.getChildren();
         List<DepartmentUserTreeWebVo> list = Lists.newArrayList();
-        String loginOrgCode= getLoginOrgCode(reginParams);
+        String loginOrgCode= getOrgCode(reginParams);
         for (int i = 0; i < children.size(); i++) {
             Map<String, Object> map = (LinkedHashMap) children.get(i);
             JSONObject json = JSON.parseObject(JSON.toJSONString(map));
@@ -302,7 +302,7 @@ public class UserController extends AbstractBaseController {
     public CommonResponse queryAllUser() {
 
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode);
         List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null);
         return CommonResponseUtil.success(userList);
@@ -747,7 +747,7 @@ public class UserController extends AbstractBaseController {
     public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
     	 try {
              AgencyUserModel user = getUserInfo();
-             saveSelectedOrgInfo(reginParams);
+//             saveSelectedOrgInfo(reginParams);
              return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user));
          } catch (Exception e) {
              logger.error("保存登陆用户选择公司信息异常", e);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/AbstractBaseController.java

@@ -47,151 +47,151 @@ public abstract class AbstractBaseController extends BaseController{
 	/*@Autowired
 	private RemoteSecurityServer remoteSecurityServer;
 */
-	@Autowired
-	protected HttpServletRequest request;
-
-	/**
-	 * 成功返回状态
-	 */
-	protected static final String SUCCESS = "SUCCESS";
-
-	/**
-	 * 失败返回状态
-	 */
-	protected static final String FAILED = "FAILED";
-
-	/**
-	 * 默认页大小
-	 */
-	protected static final int DEFAULT_PAGE_SIZE = 10;
-
-	  @Autowired
-	    private RedisTemplate<String, String> redisTemplate;
-	  
-	  
-	protected String getToken() {
-        String authToken = request.getHeader("token");
-        if (authToken == null) {
-            authToken = request.getHeader("X-Access-Token");
-        }
-        return authToken;
-    }
-    
-    protected String getProduct() {
-        String authToken = request.getHeader("product");
-        if (authToken == null) {
-            authToken = request.getParameter("product");
-        }
-        return authToken;
-    }
-
-    
-    protected String getAppKey() {
-        String authToken = request.getHeader("appKey");
-        if (authToken == null) {
-            authToken = request.getParameter("appKey");
-        }
-        return authToken;
-    }
-	/**
-	 * 
-	 * <pre>
-	 * 判断当前用户角色级别：true:主管/false:装备管理员
-	 * </pre>
-	 *
-	 * @return
-	 */
-	/*protected boolean isDirector() {
-		if (getUserInfo() == null) {
-			return false;
-		}
-		return getUserInfo().getRole().getRoleType() != 3;
-	}*/
-
-	/**
-	 * 获取用户角色id
-	 * 
-	 * @return
-	 */
-	/*protected String getRoleId() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		return getUserInfo().getRole().getRoleType().toString();
-	}*/
-
-	/**
-	 * 当前登录用户信息
-	 */
-	/*protected User getUserInfo() {
-		if (getToken() == null) {
-			return null;
-		}
-		return remoteSecurityServer.loginAuthentication(getToken());
-	}*/
-	
-	 protected AgencyUserModel getUserInfo() {
-	    	AgencyUserModel userModel=null;
-	    	if(getToken()!=null){
-	    	RequestContext.setToken(getToken());
-	    	RequestContext.setProduct(getProduct());
-	    	RequestContext.setAppKey(getAppKey());
-	    	
-	    	FeignClientResult feignClientResult;
-			try {
-				feignClientResult = Privilege.agencyUserClient.getme();
-		    	 userModel = (AgencyUserModel) feignClientResult.getResult();
-
-			} catch (InnerInvokException e) {
-				e.printStackTrace();
-			}
-			
-	    	}
-	        return userModel;
-
-	       // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
-	    }
-	
-	 protected String getCompanyId(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getSequenceNbr().toString();
-	        }
-	        return null;
-	    }
-
-	protected String getDepartmentName(ReginParams reginParams) {
-		if (reginParams == null) {
-			return null;
-		}
-		if (reginParams.getDepartment() != null) {
-			return reginParams.getDepartment().getDepartmentName();
-		}
-		return null;
-	}
-
-	protected String getUserId() {
-		String userId = null;
-		if (getUserInfo() != null) {
-			userId = getUserInfo().getUserId();
-		}
-		return userId;
-	}
-
-	/**
-	 * 获取当前用户所属公司名称
-	 * 
-	 * @return
-	 */
-	protected String getCurrentCompanyNameOfUser() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		
-		return getSelectedOrgInfo().getCompany().getCompanyName();
-	}
+//	@Autowired
+//	protected HttpServletRequest request;
+//
+//	/**
+//	 * 成功返回状态
+//	 */
+//	protected static final String SUCCESS = "SUCCESS";
+//
+//	/**
+//	 * 失败返回状态
+//	 */
+//	protected static final String FAILED = "FAILED";
+//
+//	/**
+//	 * 默认页大小
+//	 */
+//	protected static final int DEFAULT_PAGE_SIZE = 10;
+//
+//	  @Autowired
+//	    private RedisTemplate<String, String> redisTemplate;
+//	  
+//	  
+//	protected String getToken() {
+//        String authToken = request.getHeader("token");
+//        if (authToken == null) {
+//            authToken = request.getHeader("X-Access-Token");
+//        }
+//        return authToken;
+//    }
+//    
+//    protected String getProduct() {
+//        String authToken = request.getHeader("product");
+//        if (authToken == null) {
+//            authToken = request.getParameter("product");
+//        }
+//        return authToken;
+//    }
+//
+//    
+//    protected String getAppKey() {
+//        String authToken = request.getHeader("appKey");
+//        if (authToken == null) {
+//            authToken = request.getParameter("appKey");
+//        }
+//        return authToken;
+//    }
+//	/**
+//	 * 
+//	 * <pre>
+//	 * 判断当前用户角色级别：true:主管/false:装备管理员
+//	 * </pre>
+//	 *
+//	 * @return
+//	 */
+//	/*protected boolean isDirector() {
+//		if (getUserInfo() == null) {
+//			return false;
+//		}
+//		return getUserInfo().getRole().getRoleType() != 3;
+//	}*/
+//
+//	/**
+//	 * 获取用户角色id
+//	 * 
+//	 * @return
+//	 */
+//	/*protected String getRoleId() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		return getUserInfo().getRole().getRoleType().toString();
+//	}*/
+//
+//	/**
+//	 * 当前登录用户信息
+//	 */
+//	/*protected User getUserInfo() {
+//		if (getToken() == null) {
+//			return null;
+//		}
+//		return remoteSecurityServer.loginAuthentication(getToken());
+//	}*/
+//	
+//	 protected AgencyUserModel getUserInfo() {
+//	    	AgencyUserModel userModel=null;
+//	    	if(getToken()!=null){
+//	    	RequestContext.setToken(getToken());
+//	    	RequestContext.setProduct(getProduct());
+//	    	RequestContext.setAppKey(getAppKey());
+//	    	
+//	    	FeignClientResult feignClientResult;
+//			try {
+//				feignClientResult = Privilege.agencyUserClient.getme();
+//		    	 userModel = (AgencyUserModel) feignClientResult.getResult();
+//
+//			} catch (InnerInvokException e) {
+//				e.printStackTrace();
+//			}
+//			
+//	    	}
+//	        return userModel;
+//
+//	       // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
+//	    }
+//	
+//	 protected String getCompanyId(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
+//	        }
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getSequenceNbr().toString();
+//	        }
+//	        return null;
+//	    }
+//
+//	protected String getDepartmentName(ReginParams reginParams) {
+//		if (reginParams == null) {
+//			return null;
+//		}
+//		if (reginParams.getDepartment() != null) {
+//			return reginParams.getDepartment().getDepartmentName();
+//		}
+//		return null;
+//	}
+//
+//	protected String getUserId() {
+//		String userId = null;
+//		if (getUserInfo() != null) {
+//			userId = getUserInfo().getUserId();
+//		}
+//		return userId;
+//	}
+//
+//	/**
+//	 * 获取当前用户所属公司名称
+//	 * 
+//	 * @return
+//	 */
+//	protected String getCurrentCompanyNameOfUser() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		
+//		return getSelectedOrgInfo().getCompany().getCompanyName();
+//	}
 
 	/*protected LoginUserParam getLoginUserParam() {
 		LoginUserParam param = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
@@ -200,70 +200,70 @@ public abstract class AbstractBaseController extends BaseController{
 	}*/
 
 	
-	   private String buildKey(String userId, String token) {
-	        //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
-	        return "region_" + userId + "_" + token;
-
-	    }
-
-	    protected void saveSelectedOrgInfo(ReginParams reginParams) {
-	        redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
-	    }
-
-	    protected ReginParams getSelectedOrgInfo() {
-	        return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
-	    }
+//	   private String buildKey(String userId, String token) {
+//	        //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
+//	        return "region_" + userId + "_" + token;
+//
+//	    }
+
+//	    protected void saveSelectedOrgInfo(ReginParams reginParams) {
+//	        redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
+//	    }
+
+//	    protected ReginParams getSelectedOrgInfo() {
+//	        return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
+//	    }
 	/**
 	 * 获取请求的cookies
 	 * 
 	 * @return
 	 */
-	protected HashMap<String, String> getCookInfoMap() {
-		HashMap<String, String> map = new HashMap<String, String>();
-		Cookie[] cookies = request.getCookies();
-		if (cookies != null) {
-			for (Cookie ck : cookies) {
-				map.put(ck.getName(), ck.getValue());
-			}
-		}
-		return map;
-	}
-	 protected String getCompanyName(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getCompanyName();
-	        }
-	        return null;
-	    }
-	
-	  protected String getLoginOrgCode(ReginParams reginParams) {
-	        if (reginParams == null) {
-	            return null;
-	        }
-//	        if (reginParams.getDepartment() != null) {
-//	            return reginParams.getDepartment().getDeptOrgCode();
+//	protected HashMap<String, String> getCookInfoMap() {
+//		HashMap<String, String> map = new HashMap<String, String>();
+//		Cookie[] cookies = request.getCookies();
+//		if (cookies != null) {
+//			for (Cookie ck : cookies) {
+//				map.put(ck.getName(), ck.getValue());
+//			}
+//		}
+//		return map;
+//	}
+//	 protected String getCompanyName(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
 //	        }
-	        if (reginParams.getCompany() != null) {
-	            return reginParams.getCompany().getOrgCode();
-	        }
-	        return null;
-	    }
-	  
-	  
-	/**
-	 * 获取公司orgcode
-	 * 
-	 * @return
-	 *//*
-	protected String getOrgCode() {
-		if (getUserInfo() == null) {
-			return "";
-		}
-		return getUserInfo().getCompanys().getCompCode();
-	}*/
-
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getCompanyName();
+//	        }
+//	        return null;
+//	    }
+//	
+//	  protected String getLoginOrgCode(ReginParams reginParams) {
+//	        if (reginParams == null) {
+//	            return null;
+//	        }
+////	        if (reginParams.getDepartment() != null) {
+////	            return reginParams.getDepartment().getDeptOrgCode();
+////	        }
+//	        if (reginParams.getCompany() != null) {
+//	            return reginParams.getCompany().getOrgCode();
+//	        }
+//	        return null;
+//	    }
+//	  
+//	  
+//	/**
+//	 * 获取公司orgcode
+//	 * 
+//	 * @return
+//	 *//*
+//	protected String getOrgCode() {
+//		if (getUserInfo() == null) {
+//			return "";
+//		}
+//		return getUserInfo().getCompanys().getCompCode();
+//	}*/
+//
 	/**
 	 * 生成查询条件
 	 * 
@@ -331,90 +331,90 @@ public abstract class AbstractBaseController extends BaseController{
         return daoCriterias;
 
     }
-/*	public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
-		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
-		String orgCode = null;
-		if (queryRequests != null && !queryRequests.isEmpty()) {
-			for (CommonRequest query : queryRequests) {
-				DaoCriteria criteria = new DaoCriteria();
-				if (StringUtil.isNotEmpty(query.getValue())) {
-					if (query.getValue().toString().equals("-0")) {
-						criteria.setPropertyName(query.getName());
-						criteria.setOperator(QueryOperatorEnum.IS.getName());
-						criteria.setValue(null);
-					} else {
-						criteria.setPropertyName(query.getName());
-						String column = criteria.getPropertyName();
-						if (!(query.getValue() instanceof Collection<?>)
-								&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
-							criteria.setValue(Long.valueOf(query.getValue().toString()));
-						} else {
-							criteria.setValue(query.getValue());
-						}
-
-						String operator = query.getType();
-						if (!StringUtil.isNotEmpty(operator)) {
-							criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-						} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
-							setLikeCriteria(criteria, query);
-						} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else if (QueryOperatorEnum.getEnum(operator) != null) {
-							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
-						} else {
-							criteria.setOperator(operator);
-						}
-					}
-					daoCriterias.add(criteria);
-				}
-			}
-		}
-		if (flag) {
-			ReginParams param = getSelectedOrgInfo();
-			if (param == null) {
-				throw new YeeException("非法请求");
-			}
-			String roleTypeName = param.getRole().getRoleName();
-			if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
-					|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-				orgCode = param.getCompany().getOrgCode();
-				daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
-			} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-				orgCode = param.getUserOrgCode();
-				daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
-			} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-				DaoCriteria compDaoCriteria = new DaoCriteria();
-				compDaoCriteria.setPropertyName("userId");
-				compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-				compDaoCriteria.setValue(param.);
-				daoCriterias.add(compDaoCriteria);
-			}
-
-		}
-		return daoCriterias;
-
-	}*/
-    protected String getRoleTypeName(ReginParams reginParams) {
-        if (reginParams == null) {
-            return null;
-        }
-        if (reginParams.getRole() != null) {
-            return reginParams.getRole().getRoleType();
-        }
-        return null;
-    }
-    protected String getDepartmentId(ReginParams reginParams) {
-        if (reginParams == null) {
-            return null;
-        }
-        if (reginParams.getDepartment() != null) {
-            return reginParams.getDepartment().getSequenceNbr().toString();
-        }
-        return null;
-    }
-
+///*	public List<DaoCriteria> buildDaoCriterias(List<CommonRequest> queryRequests, Boolean flag) {
+//		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
+//		String orgCode = null;
+//		if (queryRequests != null && !queryRequests.isEmpty()) {
+//			for (CommonRequest query : queryRequests) {
+//				DaoCriteria criteria = new DaoCriteria();
+//				if (StringUtil.isNotEmpty(query.getValue())) {
+//					if (query.getValue().toString().equals("-0")) {
+//						criteria.setPropertyName(query.getName());
+//						criteria.setOperator(QueryOperatorEnum.IS.getName());
+//						criteria.setValue(null);
+//					} else {
+//						criteria.setPropertyName(query.getName());
+//						String column = criteria.getPropertyName();
+//						if (!(query.getValue() instanceof Collection<?>)
+//								&& column.substring(column.length() - 2, column.length()).toUpperCase().equals("ID")) {
+//							criteria.setValue(Long.valueOf(query.getValue().toString()));
+//						} else {
+//							criteria.setValue(query.getValue());
+//						}
+//
+//						String operator = query.getType();
+//						if (!StringUtil.isNotEmpty(operator)) {
+//							criteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//						} else if (operator.equals(QueryOperatorEnum.LIKE.getName())) {
+//							setLikeCriteria(criteria, query);
+//						} else if (operator.equals(QueryOperatorEnum.BIGGER_EQUAL.getName())) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else if (operator.equals(QueryOperatorEnum.LESS_EQUAL.getName())) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else if (QueryOperatorEnum.getEnum(operator) != null) {
+//							criteria.setOperator(QueryOperatorEnum.getEnum(operator).getName());
+//						} else {
+//							criteria.setOperator(operator);
+//						}
+//					}
+//					daoCriterias.add(criteria);
+//				}
+//			}
+//		}
+//		if (flag) {
+//			ReginParams param = getSelectedOrgInfo();
+//			if (param == null) {
+//				throw new YeeException("非法请求");
+//			}
+//			String roleTypeName = param.getRole().getRoleName();
+//			if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName)
+//					|| XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//				orgCode = param.getCompany().getOrgCode();
+//				daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
+//			} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//				orgCode = param.getUserOrgCode();
+//				daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
+//			} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//				DaoCriteria compDaoCriteria = new DaoCriteria();
+//				compDaoCriteria.setPropertyName("userId");
+//				compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//				compDaoCriteria.setValue(param.);
+//				daoCriterias.add(compDaoCriteria);
+//			}
+//
+//		}
+//		return daoCriterias;
+//
+//	}*/
+//    protected String getRoleTypeName(ReginParams reginParams) {
+//        if (reginParams == null) {
+//            return null;
+//        }
+//        if (reginParams.getRole() != null) {
+//            return reginParams.getRole().getRoleType();
+//        }
+//        return null;
+//    }
+//    protected String getDepartmentId(ReginParams reginParams) {
+//        if (reginParams == null) {
+//            return null;
+//        }
+//        if (reginParams.getDepartment() != null) {
+//            return reginParams.getDepartment().getSequenceNbr().toString();
+//        }
+//        return null;
+//    }
+//
 	/**
 	 * 构建数据权限 返回字段：orgCode(机构)，expression（表达式）
 	 * 
@@ -434,30 +434,30 @@ public abstract class AbstractBaseController extends BaseController{
         }
         return paramMap;
     }
-	/*public HashMap<String, Object> buildMybatisDaoCriterias() {
-		String orgCode = null;
-		LoginUserParam param = getLoginUserParam();
-		if (param == null) {
-			throw new YeeException("非法请求");
-		}
-		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		String roleTypeName = param.getRoleTypeName();
-
-		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-			orgCode = param.getLoginOrgCode();
-			paramMap.put("orgCode", orgCode + "%");
-			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
-		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-			orgCode = param.getUserOrgCode();
-			paramMap.put("orgCode", orgCode + "%");
-			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
-		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-			paramMap.put("userId", param.getUserId());
-			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
-		}
-		return paramMap;
-
-	}*/
+//	/*public HashMap<String, Object> buildMybatisDaoCriterias() {
+//		String orgCode = null;
+//		LoginUserParam param = getLoginUserParam();
+//		if (param == null) {
+//			throw new YeeException("非法请求");
+//		}
+//		HashMap<String, Object> paramMap = new HashMap<String, Object>();
+//		String roleTypeName = param.getRoleTypeName();
+//
+//		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//			orgCode = param.getLoginOrgCode();
+//			paramMap.put("orgCode", orgCode + "%");
+//			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
+//		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//			orgCode = param.getUserOrgCode();
+//			paramMap.put("orgCode", orgCode + "%");
+//			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
+//		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//			paramMap.put("userId", param.getUserId());
+//			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
+//		}
+//		return paramMap;
+//
+//	}*/
     public HashMap<String, Object> buildMybatisCriterias(String orgCode, String roleTypeName) {
         HashMap<String, Object> paramMap = new HashMap<>();
         if(StringUtil.isNotEmpty(roleTypeName)){
@@ -478,48 +478,48 @@ public abstract class AbstractBaseController extends BaseController{
         return paramMap;
 
     }
-	
-	/*public HashMap<String, Object> buildMybatisCriterias() {
-		String orgCode = null;
-		LoginUserParam param = getLoginUserParam();
-		if (param == null) {
-			throw new YeeException("非法请求");
-		}
-		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		String roleTypeName = param.getRoleTypeName();
-
-		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
-			orgCode = param.getLoginOrgCode();
-			paramMap.put("orgCode", orgCode);
-			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
-		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
-			orgCode = param.getUserOrgCode();
-			paramMap.put("orgCode", orgCode);
-			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
-		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
-			paramMap.put("userId", param.getUserId());
-			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
-		}
-		return paramMap;
-
-	}*/
-
-	/**
-	 * 暂时未用到
-	 * 
-	 * @return
-	 */
-/*	public List<DaoCriteria> buildDaoCriteriasNoParam() {
-		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
-		String orgCode = getOrgCode();
-		if (isDirector()) {
-			daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
-		} else {
-			daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
-		}
-		return daoCriterias;
-	}*/
-
+//	
+//	/*public HashMap<String, Object> buildMybatisCriterias() {
+//		String orgCode = null;
+//		LoginUserParam param = getLoginUserParam();
+//		if (param == null) {
+//			throw new YeeException("非法请求");
+//		}
+//		HashMap<String, Object> paramMap = new HashMap<String, Object>();
+//		String roleTypeName = param.getRoleTypeName();
+//
+//		if (XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName)) {
+//			orgCode = param.getLoginOrgCode();
+//			paramMap.put("orgCode", orgCode);
+//			paramMap.put("roleFlag", XJConstant.ADMIN_FLAG);
+//		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+//			orgCode = param.getUserOrgCode();
+//			paramMap.put("orgCode", orgCode);
+//			paramMap.put("roleFlag", XJConstant.DEPART_FLAG);
+//		} else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+//			paramMap.put("userId", param.getUserId());
+//			paramMap.put("roleFlag", XJConstant.PERSON_FLAG);
+//		}
+//		return paramMap;
+//
+//	}*/
+//
+//	/**
+//	 * 暂时未用到
+//	 * 
+//	 * @return
+//	 */
+///*	public List<DaoCriteria> buildDaoCriteriasNoParam() {
+//		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
+//		String orgCode = getOrgCode();
+//		if (isDirector()) {
+//			daoCriterias = buildOrgDaoCriteriaInChildren(daoCriterias, orgCode);
+//		} else {
+//			daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias, orgCode);
+//		}
+//		return daoCriterias;
+//	}*/
+    
 	/**
 	 * 
 	 * <pre>
@@ -548,29 +548,29 @@ public abstract class AbstractBaseController extends BaseController{
 		return daoCriterias;
 	}
 
-	/**
-	 * 
-	 * <pre>
-	 * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
-	 * </pre>
-	 *
-	 * @param daoCriterias
-	 *            查询条件集合
-	 * @param orgCode
-	 * @return
-	 */
-	public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
-		/**
-		 * 当前用户所属公司
-		 */
-
-		DaoCriteria compDaoCriteria = new DaoCriteria();
-		compDaoCriteria.setPropertyName("orgCode");
-		compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-		compDaoCriteria.setValue(orgCode);
-		daoCriterias.add(compDaoCriteria);
-		return daoCriterias;
-	}
+//	/**
+//	 * 
+//	 * <pre>
+//	 * 生成通过当前用户所属组织机构（不包含子机构）过滤的查询条件
+//	 * </pre>
+//	 *
+//	 * @param daoCriterias
+//	 *            查询条件集合
+//	 * @param orgCode
+//	 * @return
+//	 */
+//	public List<DaoCriteria> buildOrgDaoCriteriaOutChildren(List<DaoCriteria> daoCriterias, String orgCode) {
+//		/**
+//		 * 当前用户所属公司
+//		 */
+//
+//		DaoCriteria compDaoCriteria = new DaoCriteria();
+//		compDaoCriteria.setPropertyName("orgCode");
+//		compDaoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+//		compDaoCriteria.setValue(orgCode);
+//		daoCriterias.add(compDaoCriteria);
+//		return daoCriterias;
+//	}
 
 	/**
 	 * 对like查询语句的内容进行特殊字符转义
@@ -600,43 +600,43 @@ public abstract class AbstractBaseController extends BaseController{
 		}
 	}
 
-	/**
-	 * <pre>
-	 * 提取错误异常中的错误消息
-	 * </pre>
-	 * 
-	 * <p>
-	 * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
-	 * 提取出异常信息NotNull(message = "属性不能为空！")
-	 * </p>
-	 * 
-	 * @see {@code NotBlank} ... NotNull、NotEmpty...
-	 * @see {@code Valid}
-	 * 
-	 * @param e
-	 * @return
-	 */
-	public String getErrorMessage(Exception e) {
-		StringBuilder message = new StringBuilder();
-		if (e instanceof TransactionSystemException) {
-			TransactionSystemException exception = (TransactionSystemException) e;
-			if (exception.getRootCause() instanceof ConstraintViolationException) {
-				ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
-				root.getConstraintViolations().forEach(constraintViolation -> {
-					message.append(constraintViolation.getMessageTemplate());
-				});
-			} else {
-				message.append(e.getMessage());
-			}
-		} else if (e instanceof ConstraintViolationException) {
-			((ConstraintViolationException) e).getConstraintViolations()
-					.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
-		} else {
-			message.append("操作异常！");
-		}
-		return message.toString();
-	}
-	
+//	/**
+//	 * <pre>
+//	 * 提取错误异常中的错误消息
+//	 * </pre>
+//	 * 
+//	 * <p>
+//	 * 当实体类中对属相注解了以下类似的注解，需要用try.catch语句捕获异常，使用 #getErrorMessage(Exception)
+//	 * 提取出异常信息NotNull(message = "属性不能为空！")
+//	 * </p>
+//	 * 
+//	 * @see {@code NotBlank} ... NotNull、NotEmpty...
+//	 * @see {@code Valid}
+//	 * 
+//	 * @param e
+//	 * @return
+//	 */
+//	public String getErrorMessage(Exception e) {
+//		StringBuilder message = new StringBuilder();
+//		if (e instanceof TransactionSystemException) {
+//			TransactionSystemException exception = (TransactionSystemException) e;
+//			if (exception.getRootCause() instanceof ConstraintViolationException) {
+//				ConstraintViolationException root = (ConstraintViolationException) exception.getRootCause();
+//				root.getConstraintViolations().forEach(constraintViolation -> {
+//					message.append(constraintViolation.getMessageTemplate());
+//				});
+//			} else {
+//				message.append(e.getMessage());
+//			}
+//		} else if (e instanceof ConstraintViolationException) {
+//			((ConstraintViolationException) e).getConstraintViolations()
+//					.forEach(constraintViolation -> message.append(constraintViolation.getMessageTemplate()));
+//		} else {
+//			message.append("操作异常！");
+//		}
+//		return message.toString();
+//	}
+//	
     public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
   	  List<Map<String, Object>> list = Lists.newArrayList();
   	  if (objList != null && objList.size() > 0) {
@@ -667,4 +667,6 @@ public abstract class AbstractBaseController extends BaseController{
   	  }
   	  return map;
   	}
+
 }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CatalogTreeController.java

@@ -47,7 +47,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse getCatalogTree() {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		List<Object> list  = catalogTreeService.getCatalogTree(orgCode);
 		return CommonResponseUtil.success(list);
 	}
@@ -62,7 +62,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse getCatalogList() {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		List<CatalogTree> list  = catalogTreeService.getCatalogList(orgCode);
 		return CommonResponseUtil.success(list);
 	}
@@ -79,7 +79,7 @@ public class CatalogTreeController extends AbstractBaseController {
 		try {
 			 String userId = getUserId();
 	            ReginParams reginParams = getSelectedOrgInfo();
-	            String orgCode = getLoginOrgCode(reginParams);
+	            String orgCode = getOrgCode(reginParams);
 			HashMap<String,Object> map = new HashMap<String,Object>();
 			map.put("org_code", orgCode);
 			map.put("user_id", userId);
@@ -150,7 +150,7 @@ public class CatalogTreeController extends AbstractBaseController {
 	public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		HashMap<String,Object> paramMap = new HashMap<String,Object>();
 		paramMap.put("orgCode",orgCode);
 		CatalogTreePageParam param = CatalogTreePageParamUtil.fillPageParam(queryRequests, commonPageable, paramMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -126,7 +126,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
     	ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
 
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
@@ -151,7 +151,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             HttpServletResponse response) {
     	ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
         CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap);
@@ -188,7 +188,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             HttpServletResponse response) {
     	ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(orgCode, roleTypeName);
         CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, null, paramMap);
@@ -258,7 +258,7 @@ public class CheckController extends AbstractBaseController {
 	        int count = checkService.checkHasRecord(requestParam);
 	        if (count < 1 || requestParam.getPlanTaskId() < 1) {
 	        	 ReginParams reginParams = getSelectedOrgInfo();
-	             String orgCode = getLoginOrgCode(reginParams);
+	             String orgCode = getOrgCode(reginParams);
 	             String departmentId = getDepartmentId(reginParams);
 	             requestParam.setOrgCode(orgCode);
 	             requestParam.setUserId(getUserId());
@@ -330,8 +330,8 @@ public class CheckController extends AbstractBaseController {
 //       // LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
 //        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //        ReginParams reginParams = getSelectedOrgInfo();
-//		String loginOrgCode = getLoginOrgCode(reginParams);
-//        //String loginOrgCode = loginParam.getLoginOrgCode();
+//		String loginOrgCode = getOrgCode(reginParams);
+//        //String loginOrgCode = loginParam.getOrgCode();
 //        String[] companys = loginOrgCode.split("\\*");
 //
 //        String path = XJConstant.UPLOAD_ROOT_PATH + File.separator + companys[companys.length - 1] + File.separator
@@ -462,7 +462,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
         try {
         	ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
 
@@ -483,7 +483,7 @@ public class CheckController extends AbstractBaseController {
     public CommonResponse queryRecordByPointId(
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
          ReginParams reginParams = getSelectedOrgInfo();
-         String loginOrgCode = getLoginOrgCode(reginParams);
+         String loginOrgCode = getOrgCode(reginParams);
          String roleTypeName = getRoleTypeName(reginParams);
          String departmentId = getDepartmentId(reginParams);
         HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests);
@@ -558,7 +558,7 @@ public class CheckController extends AbstractBaseController {
             if (htmlFile.exists()) {
                 htmlFile.delete();
             }
-            return new CommonResponse(SUCCESS, data, "查询成功");
+            return new CommonResponse("SUCCESS", data, "查询成功");
         } catch (TransformerException | IOException e) {
             e.printStackTrace();
             return null;
@@ -592,7 +592,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckStatisticalParam queryRequests) {
     	 String userId = getUserId();
          ReginParams reginParams = getSelectedOrgInfo();
-         String loginOrgCode = getLoginOrgCode(reginParams);
+         String loginOrgCode = getOrgCode(reginParams);
          queryRequests.setOrgCode(loginOrgCode);
         List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests);
         return CommonResponseUtil.success(list);
@@ -606,7 +606,7 @@ public class CheckController extends AbstractBaseController {
             HttpServletResponse response) {
     	 String userId = getUserId();
          ReginParams reginParams = getSelectedOrgInfo();
-         String loginOrgCode = getLoginOrgCode(reginParams);
+         String loginOrgCode = getOrgCode(reginParams);
          queryRequests.setOrgCode(loginOrgCode);
         List<CheckAnalysisVo> list = checkService.getCheckStatisticalAnalysis(getToken(),getProduct(),getAppKey(),queryRequests);
         String fileName = "巡检记录" + new Date().getTime();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/EquipmentRuleController.java

@@ -53,7 +53,7 @@ public class EquipmentRuleController extends AbstractBaseController{
 		token.setToke(request.getHeader("X-Access-Token"));
 		token.setAppKey(request.getHeader("appKey"));
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		map.put("orgCode",orgCode);
 		equipmentHandlerService.fireEquipRuleMessagePush(map,token);
 		return CommonResponseUtil.success();
@@ -69,7 +69,7 @@ public class EquipmentRuleController extends AbstractBaseController{
 	public CommonResponse getEquipmnetRules(
 			@ApiParam(value = "装备名称", required = true) @RequestParam(required = true) String equipmentName) {
 //		ReginParams reginParams = getSelectedOrgInfo();
-//		String orgCode = getLoginOrgCode(reginParams);
+//		String orgCode = getOrgCode(reginParams);
 //		HashMap<String, Object> param = new HashMap<>();
 //		param.put("equipmentName",equipmentName);
 //		param.put("classifyId",classifyId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ExcelExportController.java

@@ -71,7 +71,7 @@ public class ExcelExportController extends AbstractBaseController{
 		startDate 	+= " 00:00:00";
 		endDate 	+= " 23:59:59";
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		Map<String,Object> map 	=  taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode);
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/HomeController.java

@@ -54,11 +54,11 @@ public class HomeController extends AbstractBaseController{
 		HashMap<String, Object> response = new HashMap<String, Object>();
 		HashMap<String, Object> statusList = new HashMap<String, Object>();
 		    ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String companyName = getCompanyName(reginParams);
 		/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
 				XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
-			orgCode = loginParam.getLoginOrgCode();
+			orgCode = loginParam.getOrgCode();
 		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
 			orgCode = loginParam.getUserOrgCode();
 		}*/
@@ -89,7 +89,7 @@ public class HomeController extends AbstractBaseController{
 	public CommonResponse getCheckData() {
 		   String userId = getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 		SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -106,7 +106,7 @@ public class HomeController extends AbstractBaseController{
 		HashMap<String, Object> param = new HashMap<String, Object>();
 		/*if (XJConstant.ROLE_NAME_ADMIN.equals(loginParam.getRoleTypeName()) ||
 				XJConstant.ROLE_NAME_SUPERADMIN.equals(loginParam.getRoleTypeName())) {
-			param.put("orgCode", loginParam.getLoginOrgCode());
+			param.put("orgCode", loginParam.getOrgCode());
 		} else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(loginParam.getRoleTypeName())) {
 			param.put("orgCode", loginParam.getUserOrgCode());
 		} else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -81,7 +81,7 @@ public class InputItemController extends AbstractBaseController {
 		try {
 			InputItem inputItem = new InputItem();
 			 ReginParams reginParams = getSelectedOrgInfo();
-	         String loginOrgCode = getLoginOrgCode(reginParams);
+	         String loginOrgCode = getOrgCode(reginParams);
 
 			BeanUtils.copyProperties(param, inputItem);
 			///LoginUserParam loginParam = getLoginUserParam();
@@ -219,7 +219,7 @@ public class InputItemController extends AbstractBaseController {
 		//LoginUserParam user = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
 
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 
 
 		HashMap<String, Object> paramMap = new HashMap<String, Object>();
@@ -242,7 +242,7 @@ public class InputItemController extends AbstractBaseController {
 			@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		// 1.组织查询条件数据
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
         List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, false, loginOrgCode, roleTypeName);
 		// 2.组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
@@ -266,7 +266,7 @@ public class InputItemController extends AbstractBaseController {
 	@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
 	public CommonResponse queryCustomInputItem( @RequestBody HashMap<String,Object> params){
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		List<PointInputItemVo> list = inputItemService.queryCustomInputItem(params.get("itemType").toString(),params.get("nameOrItemNo").toString(),orgCode);
 		return CommonResponseUtil.success(list);
 	}
@@ -283,7 +283,7 @@ public class InputItemController extends AbstractBaseController {
 			@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		// 组织数据权限过滤条件，基础数据不管roleType，全按照选择的公司orgCode过滤
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 		List<InputItem> list = null;
 
 		if (ObjectUtils.isEmpty(queryRequests)) {
@@ -328,7 +328,7 @@ public class InputItemController extends AbstractBaseController {
 			@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "itemId") Long itemId,
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java

@@ -65,7 +65,7 @@ public class LatentDangerController extends AbstractBaseController {
             }
 
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = getDepartmentId(reginParams);
             String companyId = getCompanyId(reginParams);
             String departmentName = getDepartmentName(reginParams);
@@ -87,7 +87,7 @@ public class LatentDangerController extends AbstractBaseController {
                 return CommonResponseUtil.failure("用户session过期");
             }
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = getDepartmentId(reginParams);
             String companyId = getCompanyId(reginParams);
             String departmentName = getDepartmentName(reginParams);
@@ -110,7 +110,7 @@ public class LatentDangerController extends AbstractBaseController {
                 return CommonResponseUtil.failure("用户session过期");
             }
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String deptId = null;
             return iLatentDangerService.list(getToken(), getProduct(), getAppKey(), latentDangerListParam, user, loginOrgCode, deptId);
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/MsgController.java

@@ -98,7 +98,7 @@ public class MsgController extends AbstractBaseController {
 			AgencyUserModel userModel = getUserInfo();
         String userId = userModel.getUserId();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
 		String deptId=null;
 		if( reginParams.getDepartment()!=null){
 			deptId = reginParams.getDepartment().getDepartmentDesc();
@@ -189,7 +189,7 @@ public class MsgController extends AbstractBaseController {
 			AgencyUserModel userModel = getUserInfo();
 	        String userId = userModel.getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 			for (MsgSubscribe s: subscribe) {
 				s.setOrgCode(orgCode);
 				s.setUserId(userModel.getUserId());
@@ -298,7 +298,7 @@ public class MsgController extends AbstractBaseController {
 			
 			AgencyUserModel user = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
 			CommonRequest request = new CommonRequest();
 			CommonRequest request1 = new CommonRequest();
@@ -366,7 +366,7 @@ public class MsgController extends AbstractBaseController {
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		try {
 			  ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 	            String roleTypeName = getRoleTypeName(reginParams);
 	            HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 	         if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)||XJConstant.ROLE_NAME_PERSON.equals(roleTypeName))
@@ -413,7 +413,7 @@ public class MsgController extends AbstractBaseController {
             msg.setCreateBy(user.getUserId());
             ReginParams reginParams = getSelectedOrgInfo();
             msg.setUserName(user.getRealName());
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
             msg.setOrgCode(loginOrgCode);
             List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg);
 			msgList.forEach(m->{

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java

@@ -47,7 +47,7 @@ public class PlanController extends AbstractBaseController {
 	public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 		    String deptId="";
 		    String userId="";
@@ -78,7 +78,7 @@ public class PlanController extends AbstractBaseController {
 		try {
 		  	String userId = getUserId();
 			ReginParams reginParams = getSelectedOrgInfo();
-			String loginOrgCode = getLoginOrgCode(reginParams);
+			String loginOrgCode = getOrgCode(reginParams);
 			HashMap<String,Object> map = new HashMap<String,Object>();
 			map.put("org_code", loginOrgCode);
 			map.put("user_id", userId);
@@ -157,7 +157,7 @@ public class PlanController extends AbstractBaseController {
 	public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		 ReginParams reginParams = getSelectedOrgInfo();
 	        String roleTypeName = getRoleTypeName(reginParams);
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 		PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
 		List<HashMap<String,Object>> list= planService.getPlanInfoNoPage(param);
@@ -169,7 +169,7 @@ public class PlanController extends AbstractBaseController {
 	@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse queryPlanList() {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 		List<HashMap<String,Object>> list= planService.queryPlanListByOrgCode(loginOrgCode);
 		return CommonResponseUtil.success(list);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -94,7 +94,7 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
     	  ReginParams reginParams = getSelectedOrgInfo();
-          String loginOrgCode = getLoginOrgCode(reginParams);
+          String loginOrgCode = getOrgCode(reginParams);
           String roleTypeName = getRoleTypeName(reginParams);
           HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
         PlanTaskPageParam params = new PlanTaskPageParam();
@@ -190,7 +190,7 @@ public class PlanTaskController extends AbstractBaseController {
             HttpServletResponse response) {
         try {
         	  ReginParams reginParams = getSelectedOrgInfo();
-              String loginOrgCode = getLoginOrgCode(reginParams);
+              String loginOrgCode = getOrgCode(reginParams);
               String roleTypeName = getRoleTypeName(reginParams);
               HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
             PlanTaskPageParam params = new PlanTaskPageParam();
@@ -271,7 +271,7 @@ public class PlanTaskController extends AbstractBaseController {
             HashMap<String, Object> params = new HashMap<String, Object>();
             //LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
             ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
            /* if (ObjectUtils.isEmpty(loginParam)) {
                 return CommonResponseUtil.failure("公司选择失效");
             }*/
@@ -509,7 +509,7 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
         HashMap<String, Object> params = new HashMap<String, Object>();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         params = PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
        // LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
@@ -625,7 +625,7 @@ public class PlanTaskController extends AbstractBaseController {
         HashMap<String, Object> params = new HashMap<String, Object>();
         HashMap<String, Object> resp = new HashMap<String, Object>();
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         String departmentId = getDepartmentId(reginParams);
         PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
@@ -728,7 +728,7 @@ public class PlanTaskController extends AbstractBaseController {
     public CommonResponse queryLeavePlanTask() {
     	  String userId = getUserId();
           ReginParams reginParams = getSelectedOrgInfo();
-          String loginOrgCode = getLoginOrgCode(reginParams);
+          String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("userId", userId);
         params.put("orgCode", loginOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -95,7 +95,7 @@ public class PointController extends AbstractBaseController {
 		}
 		try {
 			 ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 			pointParam.getPoint().setOrgCode(loginOrgCode);	//点归属于公司
 			pointParam.getPoint().setCreatorId(user.getUserId());
 			Point point = iPointService.addPoint(pointParam);
@@ -127,7 +127,7 @@ public class PointController extends AbstractBaseController {
 		}
 		try {
 			ReginParams reginParams = getSelectedOrgInfo();
-			String loginOrgCode = getLoginOrgCode(reginParams);
+			String loginOrgCode = getOrgCode(reginParams);
 			pointParam.getPoint().setOrgCode(loginOrgCode);	//点归属于公司
 			pointParam.getPoint().setCreatorId(user.getUserId());
 			Point point = iPointService.newAddPoint(pointParam);
@@ -165,7 +165,7 @@ public class PointController extends AbstractBaseController {
 		}
 		try {
 			 ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 
 			param.setOrgCode(loginOrgCode);	//点归属于公司
 			param.setCreatorId(user.getUserId());
@@ -293,7 +293,7 @@ public class PointController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
@@ -344,7 +344,7 @@ public class PointController extends AbstractBaseController {
 		}
 		 String userId = getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -366,7 +366,7 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse exportTemplate(HttpServletResponse response) {
 		 String userId = getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
         String fileName = "巡检点导入模板"; //模板名称
         String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","3维地图坐标","3维地图楼层","最少拍照数量","最多拍照数量","风险等级","备注说明","所属分类目录","检查项目","是否室内"}; //列标题
         List<String[]> downData = new ArrayList();
@@ -400,7 +400,7 @@ public class PointController extends AbstractBaseController {
 			HttpServletResponse response) {
 		  String userId = getUserId();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -427,7 +427,7 @@ public class PointController extends AbstractBaseController {
 			@RequestParam(value="exportType",required = false) int exportType,
 			HttpServletResponse response) {
 		ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -457,7 +457,7 @@ public class PointController extends AbstractBaseController {
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -481,7 +481,7 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse listPoint(@ApiParam(value = "巡检点编码", required = false) @RequestParam("ids") List<String> ids,
 									@ApiParam(value = "巡检点名称", required = false) @RequestParam("names") List<String> names) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		try {
 
 
@@ -504,11 +504,11 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse queryPoints(@ApiParam(value = "巡检点编码", required = false) @RequestParam("code") String code,
 									@ApiParam(value = "巡检点名称", required = false) @RequestParam("name") String name) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-		 String orgCode = getLoginOrgCode(reginParams);
+		 String orgCode = getOrgCode(reginParams);
 		try {
 			/*String orgCode = null;
 			if (!ObjectUtils.isEmpty(reginParams)) {
-				orgCode = loginUserParam.getLoginOrgCode();
+				orgCode = loginUserParam.getOrgCode();
 			} */
 			List<HashMap<String, Object>> list = iPointService.findPointList(code, name, orgCode);
 			return CommonResponseUtil.success(list);
@@ -666,7 +666,7 @@ public class PointController extends AbstractBaseController {
 	@GetMapping(value = "/queryPointPie", produces = "application/json;charset=UTF-8")
 	public CommonResponse queryPointPie() {
 		    ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		HashMap<String, Object> params = new HashMap<String, Object>();
@@ -685,7 +685,7 @@ public class PointController extends AbstractBaseController {
 	@GetMapping(value = "/queryPointHistogram", produces = "application/json;charset=UTF-8")
 	public CommonResponse queryPointHistogram() {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		HashMap<String, Object> params = new HashMap<String, Object>();
@@ -751,7 +751,7 @@ public class PointController extends AbstractBaseController {
 			@ApiParam(value = "巡检点id", required = true) @PathVariable(name = "pointId") Long pointId,
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
@@ -784,12 +784,12 @@ public class PointController extends AbstractBaseController {
 	@GetMapping(value = "/queryLeavelPoint", produces = "application/json;charset=UTF-8")
 	public CommonResponse queryLeavelPoint(@ApiParam(value = "数据同步开始时间（不传为全部同步）", required = false) @RequestParam(required=false) String startTime) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
-		//String orgCode = loginUserParam.getLoginOrgCode();
+		//String orgCode = loginUserParam.getOrgCode();
 		return CommonResponseUtil.success(iPointService.queryLeavelPoint(getToken(), getProduct(), getAppKey(),loginOrgCode, startTime));
 	}
 
@@ -814,7 +814,7 @@ public class PointController extends AbstractBaseController {
 	@PostMapping(value = "/exportPoint/iec", produces = "application/json;charset=UTF-8")
 	public CommonResponse exportIecPoint(HttpServletResponse response) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
         String fileName = "巡检点点位"; //模板名称
         String[] handers = {"点位名称","点位编码"}; //列标题

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/QueryStatsController.java

@@ -46,7 +46,7 @@ public class QueryStatsController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
         HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		CheckStatsListPageParam param = CheckStatsParamUtils.fillCheckInfoParam(queryRequests, commonPageable, paramMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

@@ -76,7 +76,7 @@ public class RouteController extends AbstractBaseController {
 	public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
 		try {
 			 ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 			route.setOrgCode(loginOrgCode);
 			route.setIsDelete(false);
 			if (routeService.existRouteName(loginOrgCode, route.getName())) {
@@ -126,7 +126,7 @@ public class RouteController extends AbstractBaseController {
 	public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
 		try {
 			 ReginParams reginParams = getSelectedOrgInfo();
-	            String orgCode = getLoginOrgCode(reginParams);
+	            String orgCode = getOrgCode(reginParams);
 			route.setOrgCode(orgCode);
 			route.setCreatorId(getUserId());
 			Route newRoute = routeService.updateRoute(route);
@@ -238,7 +238,7 @@ public class RouteController extends AbstractBaseController {
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		try {
 			ReginParams reginParams = getSelectedOrgInfo();
-            String loginOrgCode = getLoginOrgCode(reginParams);
+            String loginOrgCode = getOrgCode(reginParams);
 			HashMap<String,Object> paramMap = new HashMap<String,Object>();
 			paramMap.put("orgCode",loginOrgCode);
 			RoutePageParam params = RoutePageParamUtil.fillRouteInfoParam(queryRequests, commonPageable, paramMap);
@@ -288,7 +288,7 @@ public class RouteController extends AbstractBaseController {
 //			List<DaoCriteria> criterias = new ArrayList<DaoCriteria>();
 			 //1.组织数据权限信息
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
 //			DaoCriteria compDaoCriteria = new DaoCriteria();
 //			compDaoCriteria.setPropertyName("orgCode");
 //			compDaoCriteria.setOperator(QueryOperatorEnum.LIKE.getName());
@@ -316,14 +316,14 @@ public class RouteController extends AbstractBaseController {
             String roleTypeName = getRoleTypeName(reginParams);
 
 			if(XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase()) || XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase())){
-				loginOrgCode = getLoginOrgCode(reginParams);
+				loginOrgCode = getOrgCode(reginParams);
 			}else if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName.toUpperCase())){
 				departmentId = getDepartmentId(reginParams);
-				loginOrgCode = getLoginOrgCode(reginParams);
+				loginOrgCode = getOrgCode(reginParams);
 				userId = userModel.getUserId();
 			}else if(XJConstant.ROLE_NAME_PERSON.equals(roleTypeName.toUpperCase())){
 				userId = userModel.getUserId();
-				loginOrgCode = getLoginOrgCode(reginParams);
+				loginOrgCode = getOrgCode(reginParams);
 			}
 			List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCode(loginOrgCode,userId,departmentId);
 			routeList=routeList.stream().distinct().collect(Collectors.toList());
@@ -348,7 +348,7 @@ public class RouteController extends AbstractBaseController {
 		try {
 			 String uid = getUserId();
 	            ReginParams reginParams = getSelectedOrgInfo();
-	            String orgCode = getLoginOrgCode(reginParams);
+	            String orgCode = getOrgCode(reginParams);
 			HashMap<String, Object> reqParam = new HashMap<>();
 			reqParam.put("orgCode", orgCode);
 			RoutePageParamUtil.fillRouteInfo(queryRequests, reqParam);
@@ -390,7 +390,7 @@ public class RouteController extends AbstractBaseController {
 		try {
 			 String uid = getUserId();
 	            ReginParams reginParams = getSelectedOrgInfo();
-	            String loginOrgCode = getLoginOrgCode(reginParams);
+	            String loginOrgCode = getOrgCode(reginParams);
 			List<RoutePoint> routePointList = new ArrayList<>();
 			for (String pointId : pointIds) {
 				RoutePoint routePoint = new RoutePoint();
@@ -526,7 +526,7 @@ public class RouteController extends AbstractBaseController {
 	public CommonResponse updateRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
 		try {
 			ReginParams reginParams = getSelectedOrgInfo();
-			String orgCode = getLoginOrgCode(reginParams);
+			String orgCode = getOrgCode(reginParams);
 			route.setOrgCode(orgCode);
 			route.setCreatorId(getUserId());
 			return CommonResponseUtil.success(routeService.updateRouteNew(route));

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyController.java

@@ -61,7 +61,7 @@ public class SafetyController extends AbstractBaseController{
     @ApiOperation(value = "  保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
     @PostMapping(value = "/save/curCompany")
     public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
-        this.saveSelectedOrgInfo(reginParams);
+//        this.saveSelectedOrgInfo(reginParams);
         // CatalogTree  hh4= new CatalogTree();
        // CommonResponse  hh= pointService.pushSpcCheckResult(hh4);
         

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyPreCtrlController.java

@@ -75,7 +75,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/countPoint", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse sumCheckPtById() {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 		List<HashMap<String,Object>> List= pointService.getSumPtByRole(paramMap);
@@ -92,7 +92,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/countMonth/{dateMonth}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse countMonthCheckById(@ApiParam(value = "年月日(yyyyMMdd)8位", required = false) @PathVariable String dateMonth) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 		List<HashMap<String, Object>>  countList = checkService.getCountMonthChkByRole(paramMap,dateMonth);
@@ -110,7 +110,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	public CommonResponse findChkExList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 		CheckPtListPageParam params = CheckPageParamUtil.fillChkExParam(queryRequests,commonPageable,paramMap);
@@ -127,7 +127,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/point/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
 	 public CommonResponse getQueryCriteriaInit(){
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 	        String companyId = getCompanyId(reginParams);
@@ -147,7 +147,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/check-info/count", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse countCheckInfoDate(@ApiParam(value = "查询条件", required = false) @RequestBody HashMap<String,Object> map ) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		paramsMap.put("checkMonth", map.get("date").toString().subSequence(0, 6));
@@ -166,7 +166,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/check-user/{PointID}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse qryCheckUserById(@ApiParam(value = "点编号", required = true) @PathVariable int PointID) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramsMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		List<CheckUserBo> userList = checkService.getAuthUserInfo(paramsMap);
@@ -185,7 +185,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		CheckInfoListPageParam params = CheckPageParamUtil.fillChkInfoListParam(queryRequests, commonPageable, paramMap);
@@ -206,14 +206,14 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 		CommonPage<CheckInputBo> checkInputBos = null;
 		try {
 			checkInputBos = checkService.getCheckInputByCheckId(param);
-			checkInputBos.setResult(SUCCESS);
+			checkInputBos.setResult("SUCCESS");
 		} catch (Exception e) {
 			e.printStackTrace();
 			if (ObjectUtils.isEmpty(checkInputBos)) {
 				checkInputBos = new CommonPage(null, null, 0);
 			}
 			checkInputBos.setMessage(e.getMessage());
-			checkInputBos.setResult(FAILED);
+			checkInputBos.setResult("FAILED");
 		}
 		return CommonResponseUtil.success(checkInputBos);
 	}
@@ -271,7 +271,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = false) CommonPageable commonPageable) {
 		    ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
 		CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests, commonPageable, paramMap);
@@ -382,7 +382,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable){
 		try {
 			ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 			CheckPtListPageParam params = CheckPageParamUtil.fillTraParam(queryRequests, commonPageable, paramMap);
@@ -404,7 +404,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/routePlanPoint/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse findRoutePlanPointList(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        HashMap<String, Object> paramMap = buildMybatisDaoCriterias(loginOrgCode, roleTypeName);
 		CheckPtListPageParam params = CheckPageParamUtil.fillChkPtParam(queryRequests,null,paramMap);
@@ -417,7 +417,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@RequestMapping(value = "/queryConditions/init/{type}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
 	public CommonResponse findCheckSystemInit(@ApiParam(value="类型", required=true)@PathVariable String type) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getLoginOrgCode(reginParams);
+	        String loginOrgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 	        String companyId = getCompanyId(reginParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SynDataController.java

@@ -53,7 +53,7 @@ public class SynDataController extends AbstractBaseController {
                                     @ApiParam(value = "巡检项信息", required = true) @RequestBody SynInputItemParam synInputItemParam) {
         try {
         	ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
             String userId = getUserId();
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
@@ -85,7 +85,7 @@ public class SynDataController extends AbstractBaseController {
         try {
             if (operationType.equals(saveOperationType)) {
             	ReginParams reginParams = getSelectedOrgInfo();
-                String orgCode = getLoginOrgCode(reginParams);
+                String orgCode = getOrgCode(reginParams);
                 String userId = getUserId();
                 if (ObjectUtils.isEmpty(reginParams)) {
                     return CommonResponseUtil.failure("用户session过期");
@@ -142,12 +142,12 @@ public class SynDataController extends AbstractBaseController {
                                 @ApiParam(value = "巡检路线信息") @RequestBody SynRouteParam synRouteParam) {
         try {
         	 ReginParams reginParams = getSelectedOrgInfo();
-             String orgCode = getLoginOrgCode(reginParams);
+             String orgCode = getOrgCode(reginParams);
              String userId = getUserId();
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
             }
-           // String orgCode = getLoginUserParam().getLoginOrgCode();
+           // String orgCode = getLoginUserParam().getOrgCode();
             if (operationType.equals(saveOperationType)) {
                 return iSynDataService.saveRoute(synRouteParam, userId, orgCode);
             }
@@ -171,7 +171,7 @@ public class SynDataController extends AbstractBaseController {
                                @ApiParam(value = "巡检计划信息") @RequestBody SynPlanParam synPlanParam) {
         try {
         	 ReginParams reginParams = getSelectedOrgInfo();
-             String orgCode = getLoginOrgCode(reginParams);
+             String orgCode = getOrgCode(reginParams);
              String userId = getUserId();
             Toke toke = new Toke();
             toke.setAppKey(getAppKey());
@@ -180,7 +180,7 @@ public class SynDataController extends AbstractBaseController {
             if (ObjectUtils.isEmpty(reginParams)) {
                 return CommonResponseUtil.failure("用户session过期");
             }
-           // String orgCode = getLoginUserParam().getLoginOrgCode();
+           // String orgCode = getLoginUserParam().getOrgCode();
             if (operationType.equals(saveOperationType)) {
                 return iSynDataService.savePlan(synPlanParam, userId, orgCode,toke);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/TaskController.java

@@ -122,7 +122,7 @@ public class TaskController extends AbstractBaseController{
 				return CommonResponseUtil.failure("完成时间应当大于当前时间！" );
 			}
 			ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
 			param.getTaskInfo().setOrgCode(orgCode);
 //			param.getTaskInfo().setCreateDate(new Date());
 			param.getTaskInfo().setPublisher(user.getUserId());
@@ -238,7 +238,7 @@ public class TaskController extends AbstractBaseController{
 			if (htmlFile.exists()) {
 				htmlFile.delete();
 			}
-			return new CommonResponse(SUCCESS, data, "查询成功");
+			return new CommonResponse("SUCCESS", data, "查询成功");
 		 } catch (TransformerException | IOException e) {
 			e.printStackTrace();
 			return null;
@@ -295,7 +295,7 @@ public class TaskController extends AbstractBaseController{
 		try {
 			AgencyUserModel user = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
 			taskService.handleTask(taskIds, status, user, orgCode);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
@@ -351,7 +351,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse feedbackTask(@ApiParam(value = "回复信息（包含图片base64编码）") @RequestBody FeedbackParam param) {
 		AgencyUserModel user = getUserInfo();
         ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
 		if (ObjectUtils.isEmpty(user)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
@@ -440,7 +440,7 @@ public class TaskController extends AbstractBaseController{
 			@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
 		try {
             ReginParams reginParams = getSelectedOrgInfo();
-            String orgCode = getLoginOrgCode(reginParams);
+            String orgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             String deptId ="";
 			String userId ="";
@@ -479,7 +479,7 @@ public class TaskController extends AbstractBaseController{
 			queryRequests = new ArrayList<>();
 		}
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
 		List<Task> list = taskService.queryTaskByCondition(criterias);
@@ -500,7 +500,7 @@ public class TaskController extends AbstractBaseController{
 			queryRequests = new ArrayList<>();
 		}
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        List<DaoCriteria> criterias = buildDaoCriterias(queryRequests, true, orgCode, roleTypeName);
 		int count = taskService.queryTaskCountByCondition(criterias);
@@ -512,7 +512,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "条件查询任务图表数据(<font color='blue'>手机app</font>)", notes = "条件查询任务图表数据(<font color='blue'>手机app</font>)")
 	public CommonResponse queryTaskCharts(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests) {
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		if (queryRequests == null) {
@@ -562,7 +562,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse queryTasksByPage(@ApiParam(value = "组合查询条件", required = false, defaultValue = "[]") @RequestBody(required = false) List<CommonRequest> queryRequests,
 				@ApiParam(value = "分页参数", required = false, defaultValue = "current=0&pageSize=10或pageNumber0&pageSize=10") CommonPageable pageable) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		if (queryRequests == null) {
@@ -617,7 +617,7 @@ public class TaskController extends AbstractBaseController{
 	@RequestMapping(value = "/queryCriteria/init", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse getQueryCriteriaInit(){
 		ReginParams reginParams = getSelectedOrgInfo();
-        String orgCode = getLoginOrgCode(reginParams);
+        String orgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return CommonResponseUtil.failure("用户session过期");
@@ -659,7 +659,7 @@ public class TaskController extends AbstractBaseController{
 	public CommonResponse hiddenDangerCountByDate(@ApiParam(value = "年月日(yyyyMMdd)8位", required = true) @PathVariable String dateMonth) {
 		HashMap<String,Object> params = new HashMap<String,Object>();
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase()) ||
 	                XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
@@ -706,7 +706,7 @@ public class TaskController extends AbstractBaseController{
 		HashMap<String,Object> params = new HashMap<String,Object>();		HashMap<String,Object> resp = new HashMap<String,Object>();
 		 AgencyUserModel user = getUserInfo();
 	        ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 	        String roleTypeName = getRoleTypeName(reginParams);
 	        String departmentId = getDepartmentId(reginParams);
 		params.put("orgCode",orgCode);
@@ -739,7 +739,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "查询任务统计", notes = "查询任务统计")
 	public CommonResponse getTaskStatistics(@RequestBody(required=true) TaskStatisticsParam param) {
 		 ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		param.setOrgCode(orgCode);
 		List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
 	      if (list!=null&&list.size()>0){
@@ -792,7 +792,7 @@ public class TaskController extends AbstractBaseController{
 	@ApiOperation(value = "查询任务统计", notes = "查询任务统计")
 	public void exportStatisticsData(@RequestBody(required=true) TaskStatisticsParam param, HttpServletResponse response) {
 		   ReginParams reginParams = getSelectedOrgInfo();
-	        String orgCode = getLoginOrgCode(reginParams);
+	        String orgCode = getOrgCode(reginParams);
 		param.setOrgCode(orgCode);
 		List<TaskStatisticsVo> list = taskService.getTaskStatistics(param);
 		 if (list!=null&&list.size()>0){

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/TaskReportController.java

@@ -47,7 +47,7 @@ public class TaskReportController extends AbstractBaseController{
 		startDate += " 00:00:00";
 		endDate += " 23:59:59";
 		ReginParams reginParams = getSelectedOrgInfo();
-		String orgCode = getLoginOrgCode(reginParams);
+		String orgCode = getOrgCode(reginParams);
 		return CommonResponseUtil.success(taskReportService.queryForTaskReport(getToken(),getProduct(),getAppKey(),statistical,startDate,endDate,planId,routeId,orgCode));
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/UserController.java

@@ -185,7 +185,7 @@ public class UserController extends AbstractBaseController {
         CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), reginParams.getCompany().getSequenceNbr().toString());
         List children = (List) companyModel.getChildren();
         List<DepartmentUserTreeWebVo> list = Lists.newArrayList();
-        String loginOrgCode= getLoginOrgCode(reginParams);
+        String loginOrgCode= getOrgCode(reginParams);
         for (int i = 0; i < children.size(); i++) {
             Map<String, Object> map = (LinkedHashMap) children.get(i);
             JSONObject json = JSON.parseObject(JSON.toJSONString(map));
@@ -301,7 +301,7 @@ public class UserController extends AbstractBaseController {
     public CommonResponse queryAllUser() {
 
         ReginParams reginParams = getSelectedOrgInfo();
-        String loginOrgCode = getLoginOrgCode(reginParams);
+        String loginOrgCode = getOrgCode(reginParams);
         List<AgencyUserModel> userModels = remoteSecurityService.listUserByOrgCode(getToken(), getProduct(), getAppKey(), loginOrgCode);
         List<LinkedHashMap<String, Object>> userList = paraseData(userModels, null);
         return CommonResponseUtil.success(userList);
@@ -746,7 +746,7 @@ public class UserController extends AbstractBaseController {
     public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
     	 try {
              AgencyUserModel user = getUserInfo();
-             saveSelectedOrgInfo(reginParams);
+//             saveSelectedOrgInfo(reginParams);
              return CommonResponseUtil.success(buildCurCompany(getToken(),getProduct(),getAppKey(),reginParams, user));
          } catch (Exception e) {
              logger.error("保存登陆用户选择公司信息异常", e);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -88,9 +88,7 @@ public class AlertCalledController extends BaseController {
 				|| ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalledDto())){
 			throw new BadRequest("参数校验失败.");
 		}
-		ReginParams reginParams =
-				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+		ReginParams reginParams =getSelectedOrgInfo();
 		//获取当前登录人公司
 //		Integer code= reginParams.getCompany().getCompanyOrgCode();
 //		AlertCalled alertCalled =  alertCalledObjsDto.getAlertCalled();
@@ -172,9 +170,7 @@ public class AlertCalledController extends BaseController {
 
 		String number =  DateUtils.stampToDate(SystemClock.now(),"yyyy-MM-dd HH:mm:ss SSS");
 		String newNumber =   number.replace("-","").replace(" ","").replace(":","");
-		ReginParams reginParams =
-				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+		ReginParams reginParams =getSelectedOrgInfo();
 //		Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
 //				DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
 //				reginParams.getUserModel().getUserId());
@@ -196,9 +192,7 @@ public class AlertCalledController extends BaseController {
 	@GetMapping(value = "/alertStatistics")
 	@ApiOperation(httpMethod = "GET",value = "警情统计",  notes = "警情统计")
 	public ResponseModel<AlarmStatisticsVo> alertStatistics() throws ParseException {
-		ReginParams reginParams =
-				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+		ReginParams reginParams =getSelectedOrgInfo();
 		//我的待办数量
 		QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>();
 		//全部待办数量

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchTaskServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchTaskServiceImpl;
 
-import static org.typroject.tyboot.core.foundation.context.RequestContext.getToken;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 派遣任务
@@ -64,9 +64,7 @@ public class DispatchTaskController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增派遣任务", notes = "新增派遣任务")
 	public ResponseModel<Boolean> save(@RequestBody DispatchTaskDto model) {
-		ReginParams reginParams =
-				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+		ReginParams reginParams =getSelectedOrgInfo();
 		Boolean flag = dispatchTaskServiceImpl.createDispatchTask(model,reginParams.getUserModel());
 	    return ResponseHelper.buildResponse(flag);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.Date;
-import java.util.List;
-import com.yeejoin.amos.boot.module.tzs.biz.service.impl.RescueProcessServiceImpl;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.RescueProcessServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 救援过程表
@@ -52,9 +52,7 @@ public class RescueProcessController extends BaseController {
 	@PostMapping(value = "/updateByAlertId")
 	@ApiOperation(httpMethod = "PUT", value = "根据警情id 更新救援信息表", notes = "根据警情id 更新救援信息表")
 	public ResponseModel<Boolean> save(@RequestBody RescueProcessDto model) {
-		ReginParams reginParams =
-				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+		ReginParams reginParams =getSelectedOrgInfo();
 		boolean update = rescueProcessServiceImpl.updateByAlertId(model,reginParams.getUserModel());
 		return ResponseHelper.buildResponse(update);
 	}