From 1441d72a3e3317aab9d0584175d5dbaa4df2e771 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 15 Jul 2024 15:18:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E8=BF=90=E7=BB=B4=E5=90=8E=E5=AF=BC=E5=85=A5iccid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalExtController.java | 32 +++++++++++++++++++ .../xymanager_common/model/IccidModel.java | 15 +++++++++ 2 files changed, 47 insertions(+) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/IccidModel.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java index 3bec14d..c90b2a4 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java @@ -7,6 +7,7 @@ import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.excel.TerminalExcel; import com.shxy.xymanager_common.exception.ApiException; +import com.shxy.xymanager_common.model.IccidModel; import com.shxy.xymanager_common.model.PhotoDayModel; import com.shxy.xymanager_common.model.TerminalGpsModel; import com.shxy.xymanager_common.model.UploadModel; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; @RestController @@ -245,4 +247,34 @@ public class TerminalExtController extends BaseController { simcardService.updateSimcard(model); return ResponseReult.success("OK"); } + + @PostMapping("importIccidForMaintain") + @ApiOperation("比对运维后导入iccid") + @Log(title = "比对运维后导入iccid", type = "导入") + public ResponseReult importIccidForMaintain(@Validated @RequestBody IccidModel model) throws Exception { + TerminalSelectVo vo = new TerminalSelectVo(); + vo.setPageindex(1); + vo.setPagesize(10000); + List list = terminalExtService.getExtTerminalList(vo); + for (View_Dy_Line_Tower_Terminals item : list) { + MntnStatus mntnStatus = item.getMntnStatus(); + if (mntnStatus != null && mntnStatus.getReportMap() != null) { + HashMap reportMap = mntnStatus.getReportMap(); + String iccid1 = (String) reportMap.get("simcard1"); + String iccid2 = (String) reportMap.get("simcard2"); + if (iccid2 != null && model.getIccidList().contains(iccid2)) { + TerminalSimcard simcard = new TerminalSimcard(); + simcard.setIccid2(iccid2); + simcard.setType2(model.getType()); + simcardService.updateSimcard(simcard); + } else if (iccid1 != null && model.getIccidList().contains(iccid1)) { + TerminalSimcard simcard = new TerminalSimcard(); + simcard.setIccid2(iccid1); + simcard.setType2(model.getType()); + simcardService.updateSimcard(simcard); + } + } + } + return ResponseReult.success("OK"); + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/IccidModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/IccidModel.java new file mode 100644 index 0000000..ef8ce87 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/IccidModel.java @@ -0,0 +1,15 @@ +package com.shxy.xymanager_common.model; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class IccidModel { + + @NotNull(message = "type不能为空") + private Integer type; + @NotNull(message = "iccidList不能为空") + private List iccidList; +}