删除打印语句，修改文件名

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

@@ -1,74 +0,0 @@
-package com.uas.eis.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.uas.eis.service.UserService;
-import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.HttpUtil.Response;
-
-@RestController
-public class HelloWorldController {
-
-	@Autowired
-	private UserService userService;
-	
-	@RequestMapping(value = "/hello", produces = "application/json;charset=utf-8")
-	public String hello(){
-		return "Hello,World!";
-	}
-	
-	@RequestMapping("/getUser")
-	public Map<String, Object> getUser(String username){
-		return userService.getUser(username);
-	}
-
-	@RequestMapping(value="/getUsers")
-	public String getUsers(){
-		return userService.getUsers();
-	}
-	
-	@RequestMapping("/api/query")
-	public Object query(String code, String param){
-		Map<String, Object> map = new HashMap<String, Object>();
-		return userService.query(code, param);
-	}
-	
-	/**
-	 * 首次登陆请求token
-	 */
-	@RequestMapping("/login")
-	public String login(String username, String password){
-		return "<pre style=\"width:50%;font-family: mic;white-space: pre-wrap;word-wrap: break-word;\">"+userService.login(username, password)+"</pre>";
-	}
-	
-	/**
-	 * token 测试
-	 */
-	@RequestMapping(value = "/test", produces = "application/json;charset=utf-8")
-	public String test(String username){
-		return "中文";
-	}
-	
-	/**
-	 * http请求测试
-	 * @return 
-	 */
-	@RequestMapping(value = "/baidu", produces = "text/html;charset=utf-8")
-	public String testHttpRequest() {
-		try {
-			return HttpUtil.sendGetRequest("https://www.baidu.com/", null).getResponseText();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}

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

@@ -0,0 +1,24 @@
+package com.uas.eis.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.uas.eis.service.QueryService;
+
+@RestController
+public class QueryController {
+
+	@Autowired
+	private QueryService userService;
+	
+	@RequestMapping("/api/query")
+	public Object query(String code, String param){
+		Map<String, Object> map = new HashMap<String, Object>();
+		return userService.query(code, param);
+	}
+	
+}

src/main/java/com/uas/eis/core/support/InterceptorConfig.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.eis.service.UserService;
+import com.uas.eis.service.QueryService;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.utils.BaseUtil;
 
@@ -18,7 +18,7 @@ import io.jsonwebtoken.Claims;
 public class InterceptorConfig implements HandlerInterceptor{
 
 	@Autowired
-	private UserService userService;
+	private QueryService userService;
 	
 	private BaseDao baseDao;
 	

src/main/java/com/uas/eis/service/UserService.java → src/main/java/com/uas/eis/service/QueryService.java

@@ -1,19 +1,13 @@
 package com.uas.eis.service;
 
-import java.util.Map;
-
-public interface UserService {
+public interface QueryService {
 
 	public abstract String login(String username, String password);
 	
-	public abstract Map<String, Object> getUser(String username);
-	
 	public abstract boolean checkUser(String username, String password);
 	
 	public abstract boolean checkAction(String username, String action);
 	
-	public String getUsers();
-	
 	public Object query(String code, String param);
 
 }

src/main/java/com/uas/eis/service/RoleService.java

@@ -1,10 +0,0 @@
-package com.uas.eis.service;
-
-public interface RoleService {
-	
-	public abstract String login(String username, String password);
-
-	public abstract boolean checkActionAccess(String username, String action);
-
-	public abstract boolean checkRoleEnable(String username);
-}

src/main/java/com/uas/eis/serviceImpl/UserServiceImpl.java → src/main/java/com/uas/eis/serviceImpl/QueryServiceImpl.java

@@ -20,13 +20,13 @@ import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.QueryArgs;
 import com.uas.eis.entity.QueryConfig;
 import com.uas.eis.entity.QueryConfigDetail;
-import com.uas.eis.service.UserService;
+import com.uas.eis.service.QueryService;
 import com.uas.eis.utils.BaseUtil;
 
 import net.sf.json.JSONObject;
 
 @Service
-public class UserServiceImpl implements UserService {
+public class QueryServiceImpl implements QueryService {
 
 	@Autowired
 	private BaseDao baseDao;
@@ -36,25 +36,15 @@ public class UserServiceImpl implements UserService {
 		return TokenHandler.createToken(username, password);
 	}
 	
-	@Override
-	@Cacheable(value="userCache")
-	public Map<String, Object> getUser(String username){
-		//SpObserver.putSp("UAS_TEST");
-		System.out.println("uuuu...........");
-		return baseDao.getJdbcTemplate().queryForMap("select em_auditman from employee where em_name = ?",username);
-	}
-	
 	@Override
 	@Cacheable(value="userEnableCache")
 	public boolean checkUser(String username, String password) {
-		System.out.println("query user enable cache.....");
 		return baseDao.checkIf("EIS_USER", "eu_enable=-1 and " + "eu_name='" + username + "' and eu_password='" + password + "'");
 	}
 
 	@Override
 	@Cacheable(value="userActionEnableCache")
 	public boolean checkAction(String username, String action) {
-		System.out.println("query user action enable.....");
 		boolean flag = false;
 		String roles = baseDao.queryForObject("select eu_role from eis_user where eu_name='" + username + "'", String.class);
 		String[] fields = {"er_reg","er_action"};
@@ -77,7 +67,6 @@ public class UserServiceImpl implements UserService {
 		String sql = "SELECT EM_NAME,EM_CODE,TO_CHAR(EM_INDATE,'yyyy-MM-dd hh24:mm:ss') EM_INDATE FROM EMPLOYEE WHERE EM_CODE = 'U0818'";
 		Map<String, Object> map = baseDao.getJdbcTemplate().queryForMap(sql);
 		List<Map<String,Object>> list = baseDao.queryForList("SELECT * FROM UPLOADDOCDETAIL WHERE UDD_UDID=284");
-		System.out.println(list);
 		return BaseUtil.parseDataToJson(map,list);
 	}
 	
@@ -118,6 +107,8 @@ public class UserServiceImpl implements UserService {
 			for(int i = 0; i < valueList.size(); i++){
 				Map<String, Object> map = new HashMap<String, Object>();
 				for(QueryConfig queryConfig : queryConfigList){
+					StringBuilder inParam = new StringBuilder();
+					StringBuilder outParam = new StringBuilder();
 					//查询方案明细表，得到要查询的字段
 					String getQueryFieldssql = "select * from queryConfigDetail where qcd_qcid = ?";
 					List<QueryConfigDetail> queryFieldsList = baseDao.query(getQueryFieldssql, QueryConfigDetail.class, queryConfig.getQc_id());
@@ -146,8 +137,10 @@ public class UserServiceImpl implements UserService {
 						}*/
 						if(match.equals("@"+mainField)){
 							condition = condition.replaceAll(match, "'"+valueList.get(i)+"'");
+							inParam.append(mainField+"="+valueList.get(i)+";");
 						}else{
 							condition = condition.replaceAll(match, "'"+argsMap.get(match.replace("@", ""))+"'");
+							inParam.append(match.replace("@","")+"="+argsMap.get(match.replace("@", ""))+";");
 						}
 					}
 					sb.append(" " + condition);		//append where条件
@@ -173,14 +166,15 @@ public class UserServiceImpl implements UserService {
 						while(it.hasNext()){
 							String value = String.valueOf(it.next());
 							argsMap.put(String.valueOf(list.get(j)), value);
+							outParam.append(String.valueOf(list.get(j))+"="+value+";");
 							j++;
 						}
 					}
 					//记录日志
-					System.out.println("记录日志");
+					String insertSql = "INSERT INTO QUERYLOG(QL_ID,QL_QCCODE,QL_PARAM,QL_RETURN,QL_DATE) VALUES(QUERYLOG_SEQ.NEXTVAL,'"+queryConfig.getQc_code()+"','"+inParam.toString()+"','"+outParam.toString()+"',SYSDATE)";
+					baseDao.execute(insertSql);
 				}
 				if(valueList.size() > 1){
-					System.out.println(map);
 					resultList.add(map);
 				}else{
 					resultmap.putAll(map);

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

@@ -1,33 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import com.uas.eis.core.support.TokenHandler;
-import com.uas.eis.service.RoleService;
-
-@Service
-public class RoleServiceImpl implements RoleService {
-
-	@Autowired
-	private JdbcTemplate jdbcTemplate; 
-	
-	@Override
-	public String login(String username, String password) {
-		return TokenHandler.createToken(username, password);
-	}
-
-	@Override
-	public boolean checkActionAccess(String username, String action) {
-		return true;
-	}
-
-	@Override
-	public boolean checkRoleEnable(String username) {
-		System.out.println("coming.....");
-		int enable = jdbcTemplate.queryForObject("select eu_enable from EIS_USER where eu_name = '" + username + "'", Integer.class);
-		return enable == -1;
-	}
-
-}