diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PihController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PihController.java index 2152d65..fd25fba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PihController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PihController.java @@ -18,11 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; - @Controller -@RequestMapping(value = "/pih") +@RequestMapping("/pih") public class PihController extends BaseController { - @Autowired private PihService pihService; @@ -62,6 +60,4 @@ public class PihController extends BaseController { Assert.notNull(loginState, "未登录"); return loginState.getId(); } - - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java deleted file mode 100644 index 6e9c34f..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.lyms.platform.operate.web.controller; - -import com.lyms.platform.common.annotation.TokenRequired; -import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.LoginContext; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.service.PihService; -import com.lyms.platform.pojo.PihParameterModel; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletRequest; - - -@Controller -@RequestMapping(value = "/pih") -public class pihController extends BaseController { - - @Autowired - private PihService pihService; - - - @ResponseBody - @RequestMapping(value = "/add", method = RequestMethod.POST) - public void addPih(PihParameterModel parameterModel) { - pihService.addPih(parameterModel); - } - - - @RequestMapping(value = "/query", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer state, Integer page, Integer limit, HttpServletRequest request) { - return pihService.queyAll(key, weekStart, weekEnd, age, type, state, page, limit, getUserId(request)); - } - - @ResponseBody - @RequestMapping(value = "/queryInfo", method = RequestMethod.GET) - public BaseResponse query(String cardNo) { - if (StringUtils.isNotEmpty(cardNo)) { - return pihService.queryInfo(cardNo); - } - return RespBuilder.buildSuccess("请输入查询条件!"); - } - - @RequestMapping(value = "/report/{id}", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public BaseResponse getPinReport(@PathVariable(value = "id") String id, HttpServletRequest request) { - return pihService.getPinReport(id, getUserId(request)); - } - - protected Integer getUserId(HttpServletRequest request) { - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Assert.notNull(loginState, "未登录"); - return loginState.getId(); - } - - -}