预案管理相关接口开发

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/ReservePlanController.java

@@ -51,7 +51,7 @@ public class ReservePlanController {
      * @return
      */
     @Log(title = "预案管理-信息新增", businessType = BusinessType.INSERT)
-    @PutMapping("reservePlanDataAdd")
+    @PostMapping("reservePlanDataAdd")
     public ApiResult<Void> reservePlanDataAdd(@RequestBody ReservePlan reservePlan) {
         reservePlanService.reservePlanDataAdd(reservePlan);
         return ApiResult.success();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReservePlanServiceImpl.java

@@ -39,13 +39,13 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .eq(ReservePlan::getEnable, 1);
         List<ReservePlan> list = this.list(queryWrapper);
-        if (CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             throw new BusinessException("预案民称重复不可添加");
         }
         reservePlan.setEnable(1);
         reservePlan.setCreateTime(LocalDateTime.now());
         reservePlan.setCreator(SecurityUtils.getUsername());
-        this.updateById(reservePlan);
+        this.save(reservePlan);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 .ne(ReservePlan::getId, reservePlan.getId())
                 .eq(ReservePlan::getEnable, 1);
         List<ReservePlan> list = this.list(queryWrapper);
-        if (CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             throw new BusinessException("预案民称重复不可添加");
         }
         reservePlan.setUpdatePerson(SecurityUtils.getUsername());
@@ -78,7 +78,7 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
         IPage<ReservePlan> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<ReservePlan> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(ReservePlan::getId, ReservePlan::getReserveName, ReservePlan::getReserveUrl, ReservePlan::getReserveType,
-                ReservePlan::getCreator, ReservePlan::getCreateTime)
+                ReservePlan::getCreator, ReservePlan::getCreateTime, ReservePlan::getCompanyId)
                 .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate);
@@ -92,6 +92,7 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 map.put("reserveUrl", page.getRecords().get(i).getReserveUrl());
                 map.put("creator", page.getRecords().get(i).getCreator());
                 map.put("createTime", page.getRecords().get(i).getCreateTime());
+                map.put("companyId", page.getRecords().get(i).getCompanyId());
                 list.add(map);
             }
         }