边代设备绑定

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));
+    }
+
+
 }

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 {
 
     /**

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;
 
     /**

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
     */

bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml

@@ -187,10 +187,9 @@
     </foreach>
   </delete>
 
-<!--by syruan on 2024-09-11-->
   <select id="getAll" resultMap="BaseResultMap">
-        select
+      select
-        <include refid="Base_Column_List"/>
+      <include refid="Base_Column_List"/>
-        from tb_bd_device_record
+      from tb_bd_device_record
     </select>
 </mapper>

bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml

@@ -33,11 +33,12 @@
     from tb_bd_record
     where id = #{id,jdbcType=BIGINT}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--@mbg.generated-->
+    update tb_bd_record set del_flag = 1
-    delete from tb_bd_record
     where id = #{id,jdbcType=BIGINT}
   </delete>
+
   <insert id="insert" parameterType="com.bonus.base.domain.TbBdRecord">
     <!--@mbg.generated-->
     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},
       </if>
       <if test="delFlag != null">
-        #{delFlag,jdbcType=INTEGER},
+        0,
       </if>
       <if test="auditStatus != null">
         #{auditStatus,jdbcType=INTEGER},
@@ -327,5 +328,6 @@
         select
         <include refid="Base_Column_List"/>
         from tb_bd_record
+        where del_flag = 0 or del_flag is null
     </select>
 </mapper>