From 1d6e0d4324809e736c87a849b49082f5e8d58c38 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Sat, 14 Sep 2024 09:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E4=BB=A3=E8=AE=BE=E5=A4=87=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbBdDeviceRecordController.java | 43 ++++++++++++++++++- .../base/controller/TbBdRecordController.java | 2 +- .../com/bonus/base/domain/TbBdRecord.java | 1 - .../java/com/bonus/base/domain/TbDevice.java | 8 +++- .../{ => base}/TbBdDeviceRecordMapper.xml | 7 ++- .../mapper/{ => base}/TbBdRecordMapper.xml | 10 +++-- .../mapper/{ => base}/TbDeviceMapper.xml | 0 .../mapper/{ => base}/TbPeopleMapper.xml | 0 .../mapper/{ => base}/TbProDepartMapper.xml | 0 .../mapper/{ => base}/TbProPowerMapper.xml | 0 .../mapper/{ => base}/TbProjectMapper.xml | 0 .../mapper/{ => base}/TbTeamMapper.xml | 0 .../mapper/{ => base}/TbUserPostMapper.xml | 0 .../mapper/{ => base}/TbWarnConfigMapper.xml | 0 14 files changed, 58 insertions(+), 13 deletions(-) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbBdDeviceRecordMapper.xml (98%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbBdRecordMapper.xml (98%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbDeviceMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbPeopleMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbProDepartMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbProPowerMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbProjectMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbTeamMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbUserPostMapper.xml (100%) rename bonus-modules/bonus-base/src/main/resources/mapper/{ => base}/TbWarnConfigMapper.xml (100%) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java index ad5fc89..0e75f1c 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java @@ -1,5 +1,6 @@ package com.bonus.base.controller; import com.bonus.base.domain.TbBdDeviceRecord; +import com.bonus.base.domain.TbBdRecord; import com.bonus.base.domain.TbDevice; import com.bonus.base.service.TbBdDeviceRecordService; import com.bonus.common.core.web.controller.BaseController; @@ -8,11 +9,13 @@ import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** * 边带记录设备表(tb_bd_device_record)表控制层 - * + * @author syruan */ @RestController @RequestMapping("/tbBdDeviceRecord") @@ -27,7 +30,7 @@ public class TbBdDeviceRecordController extends BaseController { * 通过主键查询单条数据 */ @GetMapping("{/id}") - public AjaxResult selectOne(@PathVariable("id") Long id) { + public AjaxResult getById(@PathVariable("id") Long id) { return success(tbBdDeviceRecordService.selectByPrimaryKey(id)); } @@ -38,4 +41,40 @@ public class TbBdDeviceRecordController extends BaseController { return AjaxResult.success(getDataTable(list)); } + /** + * 新增数据 + * + * @param record 实体 + * @return 新增结果 + */ + @PostMapping + public AjaxResult add(@RequestBody @NotNull(message = "参数不能为空") @Valid TbBdDeviceRecord record) { + return toAjax(tbBdDeviceRecordService.insertSelective(record)); + } + + + /** + * 编辑数据 + * + * @param record 实体 + * @return 编辑结果 + */ + @PutMapping + public AjaxResult edit(@RequestBody @NotNull(message = "参数不能为空") @Valid TbBdDeviceRecord record) { + return toAjax(tbBdDeviceRecordService.updateByPrimaryKeySelective(record)); + } + + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping("/{id}") + public AjaxResult deleteById(@PathVariable("id") Long id) { + return toAjax(tbBdDeviceRecordService.deleteByPrimaryKey(id)); + } + + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java index 34e272a..7de02c4 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java @@ -16,7 +16,7 @@ import java.util.List; * @author syruan */ @RestController -@RequestMapping("/tb_bd_record") +@RequestMapping("/tbBdRecord") public class TbBdRecordController extends BaseController { /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java index 6fb5d31..7bd9d0b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java @@ -25,7 +25,6 @@ public class TbBdRecord implements Serializable { * 主键 */ @ApiModelProperty(value="主键") - @NotNull(message = "主键不能为null") private Long id; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java index 7f05eab..6928c60 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java @@ -47,9 +47,15 @@ public class TbDevice implements Serializable { /** * 所属边带 */ - @ApiModelProperty(value="所属边带") + @ApiModelProperty(value="所属边带ID") private Long bdId; + /** + * 所属边带名称 + */ + @ApiModelProperty(value="所属边带NAME") + private String bdName; + /** * 配置id */ diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbBdDeviceRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml similarity index 98% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbBdDeviceRecordMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml index 4dad0f1..5b8082b 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/TbBdDeviceRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml @@ -187,10 +187,9 @@ - \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbBdRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml similarity index 98% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbBdRecordMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml index b7bf0c8..82897bd 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/TbBdRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml @@ -33,11 +33,12 @@ from tb_bd_record where id = #{id,jdbcType=BIGINT} + - - delete from tb_bd_record + update tb_bd_record set del_flag = 1 where id = #{id,jdbcType=BIGINT} + insert into tb_bd_record (id, depart_id, depart_name, @@ -48,7 +49,7 @@ audit_time) values (#{id,jdbcType=BIGINT}, #{departId,jdbcType=BIGINT}, #{departName,jdbcType=VARCHAR}, #{proId,jdbcType=BIGINT}, #{proName,jdbcType=VARCHAR}, #{relUser,jdbcType=VARCHAR}, - #{relPhone,jdbcType=VARCHAR}, #{delFlag,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, + #{relPhone,jdbcType=VARCHAR}, 0, #{auditStatus,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, #{auditUser,jdbcType=BIGINT}, #{auditTime,jdbcType=TIMESTAMP}) @@ -129,7 +130,7 @@ #{relPhone,jdbcType=VARCHAR}, - #{delFlag,jdbcType=INTEGER}, + 0, #{auditStatus,jdbcType=INTEGER}, @@ -327,5 +328,6 @@ select from tb_bd_record + where del_flag = 0 or del_flag is null \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbDeviceMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbPeopleMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbProPowerMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbProPowerMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbProjectMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbTeamMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbUserPostMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbUserPostMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbWarnConfigMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml similarity index 100% rename from bonus-modules/bonus-base/src/main/resources/mapper/TbWarnConfigMapper.xml rename to bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml