From 1852958fcb0b070ee4632e8c79cede073e23f834 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Wed, 26 Jan 2022 11:14:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E5=88=B7=E5=8D=A1=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=9F=A5=E8=AF=A2=E5=8D=A1=E6=8E=88=E6=9D=83=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BB=99?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eid=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/controller/XhpcCardController.java | 18 +++++++++++---- .../card/domain/ListOfAuthorizedDevices.java | 7 +++++- .../xhpc/card/mapper/TIccardDeviceMapper.java | 22 +++++++++++++++++++ .../com/xhpc/card/pojo/TIccardDevice.java | 2 +- .../xhpc/card/service/IXhpcCardService.java | 11 ++++++++++ .../service/impl/XhpcCardServiceImpl.java | 15 +++++++++++++ .../resources/mapper/TIccardDeviceMapper.xml | 12 ++++++++++ 7 files changed, 81 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java index 9a26698e..351b2ed1 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java @@ -6,10 +6,7 @@ import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author yuyang @@ -43,5 +40,18 @@ public class XhpcCardController extends BaseController { return xhpcCardService.queryDeviceList(); } + /** + * 逻辑删除指定的卡授权设备 + * + * @author WH + * @date 2022/1/26 10:37 + * @since version-1.0 + */ + @DeleteMapping("/devices/{deviceId}") + public R deleteDevice(@PathVariable("deviceId") Integer deviceId) { + + return xhpcCardService.deleteDevice(deviceId); + } + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java index e1e96a8b..7bc1c89a 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java @@ -36,6 +36,11 @@ public class ListOfAuthorizedDevices { @Data public static class DataDTO { + /** + * deviceId + */ + @JsonProperty("deviceId") + private Long deviceId; /** * deviceNumber */ @@ -57,7 +62,7 @@ public class ListOfAuthorizedDevices { @JsonProperty("grantOperator") private String grantOperator; /** - * 授权给谁的，0运营商，1平台 + * 授权给谁的，0表示运营商，1表示平台 */ @JsonProperty("type") private Integer type; diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java index 8bf8c41f..b52f6dd1 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java @@ -21,10 +21,32 @@ public interface TIccardDeviceMapper { /** * 查询所有记录 * + * @return 返回一个装着所有记录的集合 * @author WH * @date 2022/1/25 17:07 * @since version-1.0 */ List selectAll(); + /** + * 更新卡授权设备为删除状态 + * + * @param deviceId the id of card grant device + * @author WH + * @date 2022/1/26 10:48 + * @since version-1.0 + */ + void updateCardDeviceStatusIsDel(Integer deviceId); + + /** + * query specified card grant device delete status + * + * @param deviceId specified card grant device id + * @return specified card grant device record + * @author WH + * @date 2022/1/26 11:03 + * @since version-1.0 + */ + TIccardDevice selectDeletedStatusByDeviceId(Integer deviceId); + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java index f8ae38d7..3b9e31cf 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java @@ -13,7 +13,7 @@ import java.util.Date; @Data public class TIccardDevice implements Serializable { - private Integer id; + private Long id; /** * 设备名称 diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java index f7b86d2c..c5c03be6 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java @@ -28,4 +28,15 @@ public interface IXhpcCardService { */ R queryDeviceList(); + /** + * 逻辑删除指定卡授权设备 + * + * @param deviceId 卡授权设备id + * @return 返回Result结果集对象 + * @author WH + * @date 2022/1/26 10:39 + * @since version-1.0 + */ + R deleteDevice(Integer deviceId); + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 522296d2..46a80712 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -92,6 +92,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { } for (TIccardDevice tIccardDevice : tIccardDeviceList) { ListOfAuthorizedDevices.DataDTO dataDTO = new ListOfAuthorizedDevices.DataDTO(); + dataDTO.setDeviceId(tIccardDevice.getId()); dataDTO.setDeviceName(tIccardDevice.getDevname()); dataDTO.setDeviceType(tIccardDevice.getDevtype()); dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber()); @@ -102,4 +103,18 @@ public class XhpcCardServiceImpl implements IXhpcCardService { return R.ok(listOfAuthorizedDevices); } + @Override + public R deleteDevice(Integer deviceId) { + + if (deviceId == null) { + return R.fail("deviceId为null"); + } + TIccardDevice tIccardDevice = tIccardDeviceMapper.selectDeletedStatusByDeviceId(deviceId); + if (tIccardDevice != null) { + return R.fail(404, "指定资源不存在"); + } + tIccardDeviceMapper.updateCardDeviceStatusIsDel(deviceId); + return R.ok(); + } + } diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml index 0f4ad3f2..4de0f1b8 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml @@ -26,6 +26,13 @@ select from t_iccard_device + where del_flag = 0 + + delete @@ -117,4 +124,9 @@ tenant_id = #{tenantId,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} + + update t_iccard_device + set del_flag = 1 + where serialNumber = #{deviceId} + \ No newline at end of file