|
@@ -3,15 +3,20 @@ package com.welampiot.controller;
|
|
|
import com.welampiot.common.BaseResult;
|
|
|
import com.welampiot.common.InterfaceResultEnum;
|
|
|
import com.welampiot.dto.AlarmTypeDTO;
|
|
|
+import com.welampiot.dto.UserDTO;
|
|
|
import com.welampiot.dto.GlobalLocationDTO;
|
|
|
import com.welampiot.dto.InspectionTimeDTO;
|
|
|
import com.welampiot.service.GlobalLocationService;
|
|
|
+import com.welampiot.service.UserService;
|
|
|
+import com.welampiot.utils.MD5Utils;
|
|
|
+import com.welampiot.vo.LoginVO;
|
|
|
import com.welampiot.utils.ToolUtils;
|
|
|
import com.welampiot.vo.AlarmTypeVO;
|
|
|
import com.welampiot.vo.InspectionTimeVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-
|
|
|
+import javax.validation.Valid;
|
|
|
+import java.io.IOException;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
@@ -36,6 +41,9 @@ public class CommonController {
|
|
|
@Autowired
|
|
|
private ToolUtils toolUtils;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
/**
|
|
|
* 获取国家下拉列表
|
|
|
* @param request
|
|
@@ -123,6 +131,35 @@ public class CommonController {
|
|
|
}
|
|
|
return BaseResult.success(cityList);
|
|
|
}
|
|
|
+ @RequestMapping(value = "/test",method = RequestMethod.GET)
|
|
|
+ public BaseResult test(HttpServletRequest request){
|
|
|
+// Integer.parseInt(request.getParameter("test"));
|
|
|
+// Logger paramLog = LoggerFactory.getLogger("param_log");
|
|
|
+// Map<String, String[]> parameterMap = request.getParameterMap();
|
|
|
+// paramLog.info(JSON.toJSONString(parameterMap));
|
|
|
+ return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,0);
|
|
|
+ }
|
|
|
+ @RequestMapping(value = "/test2",method = RequestMethod.POST)
|
|
|
+ public BaseResult test2(HttpServletRequest request) throws InterruptedException {
|
|
|
+
|
|
|
+ Thread.sleep(1000*3);
|
|
|
+ System.out.println(request.getParameterMap().keySet());
|
|
|
+ return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,0);
|
|
|
+ }
|
|
|
+ @RequestMapping(value = "/login",method = RequestMethod.POST)
|
|
|
+ public BaseResult<UserDTO> login(@Valid LoginVO vo){
|
|
|
+ Integer version = vo.getVersion();
|
|
|
+ vo.setPassword(MD5Utils.encoderMD5(vo.getPassword()));
|
|
|
+ UserDTO user = userService.getUserByUserName(vo);
|
|
|
+ if(user!=null){
|
|
|
+ user.setToken("8748378738676237572345");
|
|
|
+ user.setCompany("8748378738676237572345");
|
|
|
+ user.setPrivilege(user.getPrivilegeList());
|
|
|
+ return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,user);
|
|
|
+ }else{
|
|
|
+ return toolUtils.response(InterfaceResultEnum.USERNAME_PASSWORD_PARAM_ERROR,version);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 获取区级的下拉列表
|