From 9935f74855d49662c47278c8b6245f17eefa10c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= Date: Wed, 28 Sep 2022 17:09:39 +0800 Subject: [PATCH] deng lu yan zhen --- .../java/com/rzyc/advice/LoginAspect.java | 2 +- .../rzyc/controller/PcCheckController.java | 52 +++++++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/inventory-ent/src/main/java/com/rzyc/advice/LoginAspect.java b/inventory-ent/src/main/java/com/rzyc/advice/LoginAspect.java index 93be42a..ee1d913 100644 --- a/inventory-ent/src/main/java/com/rzyc/advice/LoginAspect.java +++ b/inventory-ent/src/main/java/com/rzyc/advice/LoginAspect.java @@ -53,7 +53,7 @@ public class LoginAspect { //token验证 - verificationToken(userToken); +// verificationToken(userToken); return proceedingJoinPoint.proceed(); } diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PcCheckController.java b/inventory-ent/src/main/java/com/rzyc/controller/PcCheckController.java index 65c2b87..793a087 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PcCheckController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PcCheckController.java @@ -4,16 +4,14 @@ import com.common.utils.model.Code; import com.common.utils.model.Message; import com.common.utils.model.SingleResult; import com.rzyc.model.check.BookEntCheck; +import com.rzyc.model.check.BookEntHT; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @author dong @@ -54,4 +52,50 @@ public class PcCheckController extends BaseController{ } return singleResult; } + + /** + * 隐患详细 + * */ + @ApiOperation(value = "隐患详细", notes = "隐患详细") + @GetMapping("/dangerDetail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "隐患id", required = true, dataType = "string"), + }) + @ResponseBody + public SingleResult dangerDetail(String id)throws Exception { + SingleResult singleResult = new SingleResult(); + BookEntHT bookEntHT = bookEntHTMapper.selectDangerDetail(id); + if (null != bookEntHT){ + singleResult.setData(bookEntHT); + singleResult.setMessage(Message.SUCCESS); + singleResult.setCode(Code.SUCCESS.getCode()); + }else { + singleResult.setMessage(Message.ERROR); + singleResult.setCode(Code.ERROR.getCode()); + } + return singleResult; + } + + /** + * PC修改隐患状态 + * */ + @ApiOperation(value = "PC修改隐患状态", notes = "PC修改隐患状态") + @PostMapping("/updateDangerState") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "隐患id", required = true, dataType = "string"), + @ApiImplicitParam(name = "state", value = "隐患状态", required = true, dataType = "string"), + }) + @ResponseBody + public SingleResult updateDangerState(String id,String state)throws Exception { + SingleResult singleResult = new SingleResult(); + int result = bookEntHTMapper.updateDangerState(id,state); + if (result > 0 ){ + singleResult.setMessage(Message.SUCCESS); + singleResult.setCode(Code.SUCCESS.getCode()); + }else { + singleResult.setMessage(Message.ERROR); + singleResult.setCode(Code.ERROR.getCode()); + } + return singleResult; + } }