Merge remote-tracking branch 'origin/master' into test

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

@@ -43,7 +43,7 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
 
     @PostMapping("list")
     @ApiOperation("集合查询")
-    public R<List<DeviceChargingConfigDto.Vo>> list(DeviceChargingConfigDto.SelectList selectList) {
+    public R<List<DeviceChargingConfigDto.Vo>> list(@RequestBody @Validated DeviceChargingConfigDto.SelectList selectList) {
         MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(selectList.getMercId())).getData();
         LambdaQueryWrapper<DeviceChargingConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceChargingConfig.class)
                 .eq(DeviceChargingConfig::getMercCode, merc.getMercCode())

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

@@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static com.xy.utils.Beans.copy;
@@ -58,7 +59,10 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
     @PostMapping("save")
     @ApiOperation("添加")
     public R save(@RequestBody @Validated DeviceTypeAlgorithmBeforConfigDto.Save save) {
-        DeviceTypeAlgorithmBeforConfig saveInfo = copy(DeviceTypeAlgorithmBeforConfig.class, save);
+        LocalDateTime now = LocalDateTime.now();
+        DeviceTypeAlgorithmBeforConfig saveInfo = copy(DeviceTypeAlgorithmBeforConfig.class, save)
+                .setCreateTime(now)
+                .setUpdateTime(now);
         save(saveInfo);
         return R.ok().setLogMsg(String.format("商户id：%s,算法id：%s,预充金额：%s", save.getMercId(), save.getAlgorithmId(), save.getMoney()));
     }
@@ -68,8 +72,17 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
     @ApiOperation("修改")
     public R update(@RequestBody @Validated DeviceTypeAlgorithmBeforConfigDto.Update update) {
         DeviceTypeAlgorithmBeforConfig deviceTypeAlgorithmBeforConfig = getById(update.getId());
-        DeviceTypeAlgorithmBeforConfig updateInfo = copy(DeviceTypeAlgorithmBeforConfig.class, update);
+        DeviceTypeAlgorithmBeforConfig updateInfo = copy(DeviceTypeAlgorithmBeforConfig.class, update)
+                .setUpdateTime(LocalDateTime.now());
         updateById(updateInfo);
         return R.ok().setLogMsg(String.format("商户id：%s,算法id：%s,原预充金额：%s,新预充金额：%s", deviceTypeAlgorithmBeforConfig.getMercId(), deviceTypeAlgorithmBeforConfig.getAlgorithmId(), deviceTypeAlgorithmBeforConfig.getMoney(), update.getMoney()));
     }
+
+    @LogOperate
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    public R delete(@RequestBody @Validated DeviceTypeAlgorithmBeforConfigDto.Delete delete) {
+        removeById(delete.getId());
+        return R.ok();
+    }
 }

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

@@ -81,6 +81,9 @@ public class DeviceFaultMonitorConfigDto {
         @ApiModelProperty(value = "是否转售后")
         private Boolean toAfterSale;
 
+        @ApiModelProperty(value = "是否转售后")
+        private Boolean toAfterSale;
+
 
     }
 

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

@@ -58,6 +58,15 @@ public class DeviceTypeAlgorithmBeforConfigDto {
         private Integer money;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class Delete {
+
+        @NotNull(message = "id不能为空")
+        @ApiModelProperty(value = "id")
+        private Long id;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {