From b4eda22bdcc77c46a01379b2943e953980d6cc0c Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Fri, 30 Jun 2023 15:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nuclear/controller/AccountController.java | 14 ++++++++++++++ .../nuclear/controller/NuclearCoreController.java | 12 ++++++++++++ .../java/com/iflytop/nuclear/model/NuclearCore.java | 4 ++++ uploadfiles/xlsx/20230630/堆芯模版.xlsx | Bin 12790 -> 12789 bytes 4 files changed, 30 insertions(+) diff --git a/src/main/java/com/iflytop/nuclear/controller/AccountController.java b/src/main/java/com/iflytop/nuclear/controller/AccountController.java index e01ba7e..f58c517 100755 --- a/src/main/java/com/iflytop/nuclear/controller/AccountController.java +++ b/src/main/java/com/iflytop/nuclear/controller/AccountController.java @@ -4,12 +4,15 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iflytop.nuclear.model.Account; import com.iflytop.nuclear.service.AccountService; +import com.iflytop.nuclear.utils.JwtTokenUtils; import com.iflytop.nuclear.utils.ResponseData; +import com.iflytop.nuclear.vo.TaskVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -26,6 +29,8 @@ public class AccountController { @Autowired AccountService accountService; + @Autowired + HttpServletRequest request; /** * 查询用户列表 @@ -75,6 +80,15 @@ public class AccountController { @PostMapping("/delete") public ResponseData delete(@RequestBody Map userInfo){ + // 不能删除当前登陆的账号 + String token = request.getHeader("Authorization"); + if (token.length() > 0){ + String[] s = token.split(" "); + String username = JwtTokenUtils.getUsername(s[1]); + if (username.equals(userInfo.get("username"))) { + return ResponseData.fail("不能删除当前登陆的账号"); + } + } boolean b = accountService.deleteByUsername(userInfo.get("username")); JSONObject res = new JSONObject(); res.put("result", b); diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java index dc1bb41..21f8121 100644 --- a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java +++ b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iflytop.nuclear.model.NuclearCore; import com.iflytop.nuclear.model.NuclearStation; import com.iflytop.nuclear.service.NuclearCoreService; +import com.iflytop.nuclear.service.NuclearStationService; import com.iflytop.nuclear.utils.ResponseData; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -27,10 +28,21 @@ public class NuclearCoreController { @Autowired NuclearCoreService nuclearCoreService; + @Autowired + NuclearStationService nuclearStationService; @GetMapping("/list") public ResponseData list() { + // 将数据中stationid转换为名称 List list = nuclearCoreService.list(); + if (list.size() > 0){ + for (NuclearCore l : list) { + NuclearStation nuclearStation = nuclearStationService.getById(l.getStationId()); + if(nuclearStation != null) { + l.setStationName(nuclearStation.getName()); + } + } + } JSONObject res = new JSONObject(); res.put("list", list); return ResponseData.success(res); diff --git a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java index 4c612fd..1771024 100644 --- a/src/main/java/com/iflytop/nuclear/model/NuclearCore.java +++ b/src/main/java/com/iflytop/nuclear/model/NuclearCore.java @@ -8,6 +8,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.beans.Transient; + /** * @author cool * @date 2023/6/28 11:29 @@ -28,4 +30,6 @@ public class NuclearCore { @TableField("station_id") private int stationId; + @TableField(exist = false) + private String stationName; } diff --git a/uploadfiles/xlsx/20230630/堆芯模版.xlsx b/uploadfiles/xlsx/20230630/堆芯模版.xlsx index 0bebed05c97067b897b8fc5e5b66eddf2c1a7922..1b0a04e1edad8c464d54d87e2e26cb8631e968c8 100644 GIT binary patch delta 4101 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 delta 4083 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