二维码导出记录导出日期

device-api-service/src/main/java/com/xy/entity/DeviceTypeAlgorithmBeforConfig.java

@@ -2,6 +2,8 @@ package com.xy.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +26,7 @@ public class DeviceTypeAlgorithmBeforConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
     @ApiModelProperty(value = "id")
     private Long id;
 

device-api-service/src/main/java/com/xy/service/DeviceTypeAlgorithmBeforConfigServiceImpl.java

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.annotation.LogOperate;
 import com.xy.dto.DeviceTypeAlgorithmBeforConfigDto;
 import com.xy.entity.DeviceTypeAlgorithmBeforConfig;
 import com.xy.mapper.DeviceTypeAlgorithmBeforConfigMapper;
@@ -53,19 +54,22 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         return R.ok(copy(DeviceTypeAlgorithmBeforConfigDto.Vo.class, list));
     }
 
+    @LogOperate
     @PostMapping("save")
     @ApiOperation("添加")
     public R save(@RequestBody @Validated DeviceTypeAlgorithmBeforConfigDto.Save save) {
         DeviceTypeAlgorithmBeforConfig saveInfo = copy(DeviceTypeAlgorithmBeforConfig.class, save);
         save(saveInfo);
-        return R.ok();
+        return R.ok().setLogMsg(String.format("商户id：%s,算法id：%s,预充金额：%s", save.getMercId(), save.getAlgorithmId(), save.getMoney()));
     }
 
+    @LogOperate
     @PostMapping("update")
     @ApiOperation("修改")
     public R update(@RequestBody @Validated DeviceTypeAlgorithmBeforConfigDto.Update update) {
+        DeviceTypeAlgorithmBeforConfig deviceTypeAlgorithmBeforConfig = getById(update.getId());
         DeviceTypeAlgorithmBeforConfig updateInfo = copy(DeviceTypeAlgorithmBeforConfig.class, update);
         updateById(updateInfo);
-        return R.ok();
+        return R.ok().setLogMsg(String.format("商户id：%s,算法id：%s,原预充金额：%s,新预充金额", update.getMercId(), update.getAlgorithmId(), deviceTypeAlgorithmBeforConfig.getMoney(), update.getMoney()));
     }
 }

device-api/src/main/java/com/xy/dto/DeviceTypeAlgorithmBeforConfigDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -27,12 +28,34 @@ public class DeviceTypeAlgorithmBeforConfigDto {
     @Accessors(chain = true)
     public static class Save extends Vo {
 
+        @NotNull(message = "mercId不能为空")
+        @ApiModelProperty(value = "商户id")
+        private Long mercId;
+
+        @NotNull(message = "deviceType不能为空")
+        @ApiModelProperty(value = "设备类型")
+        private Integer deviceType;
+
+        @NotNull(message = "algorithmId不能为空")
+        @ApiModelProperty(value = "算法id")
+        private Long algorithmId;
+
+        @NotNull(message = "money不能为空")
+        @ApiModelProperty(value = "预充金额;单位：分")
+        private Integer money;
     }
 
     @Data
     @Accessors(chain = true)
     public static class Update extends Vo {
 
+        @NotNull(message = "id不能为空")
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @NotNull(message = "money不能为空")
+        @ApiModelProperty(value = "预充金额;单位：分")
+        private Integer money;
     }
 
     @Data