点位优化

xiangpei

2024-03-13 8dbb3cc53bfdb47e5b65738fa9abfde56f9ddd32

点位优化

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java

@@ -1,5 +1,6 @@
package com.ycl.platform.domain.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
@@ -37,7 +38,7 @@
    private LocalDateTime endTime;

    @ApiModelProperty("运维单位")
    @TableField("unit_id")
    @TableField(value = "unit_id", updateStrategy = FieldStrategy.IGNORED)
    private Integer unitId;

    @ApiModelProperty("运维状态")

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/BatchEditPointForm.java

New file
@@ -0,0 +1,32 @@
package com.ycl.platform.domain.form;

import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

/**
 * @author：xp
 * @date：2024/3/13 9:42
 */
@Data
public class BatchEditPointForm {

    @NotEmpty(message = "请选择点位")
    private List<Integer> ids;

    private Integer unitId;

    @NotNull(message = "点位开始时间不能为空", groups = {Add.class, Update.class})
    private LocalDateTime startTime;

    @NotNull(message = "点位结束时间不能为空", groups = {Add.class, Update.class})
    private LocalDateTime endTime;

}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java

@@ -36,7 +36,6 @@
    private Integer unitId;
    private String unitName;

    private String unitName;
    /** 运维状态 */
    private String status;


 ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java

@@ -1,5 +1,6 @@
package com.ycl.platform.controller;

import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,6 +51,12 @@
        return ywPointService.update(form);
    }

    @PutMapping("/batch")
    @ApiOperation(value = "批量修改运维单位", notes = "批量修改运维单位")
    public Result batchEdit(@RequestBody @Validated BatchEditPointForm form) {
        return ywPointService.batchEdit(form);
    }

    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {

 ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java

@@ -2,6 +2,7 @@

import com.ycl.platform.domain.entity.YwPoint;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.YwPointForm;
import com.ycl.platform.domain.query.YwPointQuery;
@@ -69,4 +70,11 @@
     * @return
     */
    Result batchAdd(List<YwPointForm> form);

    /**
     * 批量修改运维单位
     * @param form
     * @return
     */
    Result batchEdit(BatchEditPointForm form);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
@@ -15,17 +17,16 @@

import com.ycl.system.entity.SysDept;
import com.ycl.system.service.ISysDeptService;
import org.apache.commons.lang3.StringUtils;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -75,6 +76,27 @@
        return Result.ok("添加成功");
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result batchEdit(BatchEditPointForm form) {
        if (Objects.nonNull(form.getUnitId())) {
            new LambdaUpdateChainWrapper<>(baseMapper)
                    .in(YwPoint::getId, form.getIds())
                    .set(YwPoint::getUnitId, form.getUnitId())
                    .set(YwPoint::getStartTime, form.getStartTime())
                    .set(YwPoint::getEndTime, form.getEndTime())
                    .update();
        } else {
            new LambdaUpdateChainWrapper<>(baseMapper)
                    .in(YwPoint::getId, form.getIds())
                    .set(YwPoint::getUnitId, form.getUnitId())
                    .set(YwPoint::getStartTime, null)
                    .set(YwPoint::getEndTime, null)
                    .update();
        }
        return Result.ok("修改成功");
    }

    /**
     * 修改
     * @param form