Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-16 79df43ee4a40f48cb061249ebe2bd9a46966ecd9

Merge remote-tracking branch 'origin/master'

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

@@ -22,10 +22,14 @@
    /** 平台名称 */
    private String platformName;

    @TableField("platform_contact")
    /** 平台联系人 */
    @TableField("platform_ip")
    /** 平台名称 */
    private String platformIP;

    @TableField("area")
    /** 区域 */
    private String area;

    @TableField("status")
    /** 状态：1正常 2异常 */
    private Integer status;

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

@@ -32,6 +32,9 @@
    @ApiModelProperty("平台IP")
    private String platformIP;

    @ApiModelProperty("行政区域")
    private String area;

//    @NotBlank(message = "平台联系人不能为空", groups = {Add.class, Update.class})
//    @ApiModelProperty("平台联系人")
//    private String platformContact;

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

@@ -19,6 +19,9 @@
    /** 平台名称 */
    private String platformName;

    /** 平台IP */
    private String platformIP;

    /** 平台联系人 */
    private String platformContact;

@@ -28,6 +31,9 @@
    /** 状态：1正常 2异常 */
    private Integer status;

    /** 行政区域 */
    private String area;

    /** 备注 */
    private String remark;


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

@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.CalculateMoneyRuleForm;
import com.ycl.platform.domain.vo.CalculateMoneyRuleVO;
import com.ycl.platform.domain.query.CalculateMoneyRuleQuery;

import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +45,9 @@
    @Override
    public Result add(CalculateMoneyRuleForm form) {
        CalculateMoneyRule entity = CalculateMoneyRuleForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -58,10 +63,12 @@
    public Result update(CalculateMoneyRuleForm form) {

        CalculateMoneyRule entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);

        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.CalculateRecordForm;
import com.ycl.platform.domain.vo.CalculateRecordVO;
import com.ycl.platform.domain.query.CalculateRecordQuery;

import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +45,9 @@
    @Override
    public Result add(CalculateRecordForm form) {
        CalculateRecord entity = CalculateRecordForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -58,10 +63,11 @@
    public Result update(CalculateRecordForm form) {

        CalculateRecord entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -29,6 +29,7 @@
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -54,6 +55,9 @@
    @Override
    public Result add(CalculateReportForm form) {
        CalculateReport entity = CalculateReportForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -69,10 +73,11 @@
    public Result update(CalculateReportForm form) {

        CalculateReport entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.NotifyForm;
import com.ycl.platform.domain.vo.NotifyVO;
import com.ycl.platform.domain.query.NotifyQuery;

import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -46,6 +48,9 @@
    @Override
    public Result add(NotifyForm form) {
        Notify entity = NotifyForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -61,10 +66,11 @@
    public Result update(NotifyForm form) {

        Notify entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -18,6 +18,7 @@
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -43,12 +44,17 @@
    public Result add(PlatformForm form) {
        Platform entity = PlatformForm.getEntityByForm(form, null);
        entity.setParentId(0);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        baseMapper.insert(entity);
        if (! CollectionUtils.isEmpty(form.getDeployList())) {
            List<Platform> childList = form.getDeployList().stream().map(deploy -> {
                Platform child = new Platform();
                BeanUtils.copyProperties(deploy, child);
                child.setParentId(entity.getId());
                child.setCreateTime(now);
                child.setUpdateTime(now);
                return child;
            }).collect(Collectors.toList());
            this.saveBatch(childList);

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

@@ -11,6 +11,8 @@
import com.ycl.platform.domain.form.RegionForm;
import com.ycl.platform.domain.vo.RegionVO;
import com.ycl.platform.domain.query.RegionQuery;

import java.util.Date;
import java.util.List;

import com.ycl.utils.DateUtils;
@@ -51,6 +53,9 @@
    public Result add(RegionForm form) {
        Region entity = RegionForm.getEntityByForm(form, null);
        entity.setRegionLevel(RegionLevelEnum.STREET);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -66,10 +71,11 @@
    public Result update(RegionForm form) {

        Region entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -63,6 +63,9 @@
        Report entity = ReportForm.getEntityByForm(form, null);
        entity.setStatus(0);
        entity.setIdentify(IdUtils.timeAddRandomNO(3));
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -80,7 +83,8 @@
        Report entity = baseMapper.selectById(form.getId());
        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");

        Date now = new Date();
        entity.setUpdateTime(now);
        if (0 == entity.getStatus()) {
            // 待审核的直接改
            BeanUtils.copyProperties(form, entity);

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

@@ -105,6 +105,8 @@
                    errorType = errorType + "," + workOrder.getErrorType();
                    databaseWorkOrder.setErrorType(errorType);
                    databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
                    Date now = new Date();
                    databaseWorkOrder.setUpdateTime(now);
                    baseMapper.updateById(databaseWorkOrder);
                    updateNum++;
                    // 同时新增一个运维处理信息，表明此工单被调整 TODO
@@ -153,6 +155,9 @@
                workOrderDistributeRecord.setWorkOrderId(item.getId());
                workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
                workOrderDistributeRecord.setUserId(1L);
                Date now = new Date();
                workOrderDistributeRecord.setCreateTime(now);
                workOrderDistributeRecord.setUpdateTime(now);
                return workOrderDistributeRecord;
            }).collect(Collectors.toList());
            workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
@@ -172,6 +177,9 @@
        entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
        entity.setCreateTime(DateUtils.getNowDate());
        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -187,10 +195,11 @@
    public Result update(WorkOrderForm form) {

        WorkOrder entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -12,6 +12,7 @@
import com.ycl.platform.domain.query.YwPeopleQuery;

import java.util.Collections;
import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -76,6 +77,9 @@
        YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
        entity.setUserId(sysUser.getUserId());
        entity.setAddWay("manual");
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -114,6 +118,8 @@
        sysUserMapper.updateUser(sysUser);

        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }

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

@@ -64,6 +64,9 @@
    @Override
    public Result add(YwPointForm form) {
        YwPoint entity = YwPointForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
@@ -77,6 +80,9 @@
                .forEach(form -> {
                    YwPoint entity = YwPointForm.getEntityByForm(form, null);
                    entity.setStatus("未开始");
                    Date now = new Date();
                    entity.setCreateTime(now);
                    entity.setUpdateTime(now);
                    baseMapper.insert(entity);
                });
        return Result.ok("添加成功");
@@ -89,6 +95,7 @@
            new LambdaUpdateChainWrapper<>(baseMapper)
                    .in(YwPoint::getId, form.getIds())
                    .set(YwPoint::getUnitId, form.getUnitId())
                    .set(YwPoint::getUpdateTime, new Date())
                    .update();
        } else {
            new LambdaUpdateChainWrapper<>(baseMapper)
@@ -96,6 +103,7 @@
                    .set(YwPoint::getUnitId, form.getUnitId())
                    .set(YwPoint::getStartTime, null)
                    .set(YwPoint::getEndTime, null)
                    .set(YwPoint::getUpdateTime, new Date())
                    .update();
        }
        return Result.ok("修改成功");
@@ -111,6 +119,8 @@
        YwPoint entity = baseMapper.selectById(form.getId());
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        baseMapper.updateById(entity);
        return Result.ok("修改成功");
    }
@@ -214,6 +224,7 @@
        return new LambdaUpdateChainWrapper<>(baseMapper)
                .in(YwPoint::getSerialNumber, serialNumberList)
                .set(YwPoint::getRecovery, recovery)
                .set(YwPoint::getUpdateTime, new Date())
                .set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
                .update();
    }

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

@@ -29,10 +29,7 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -59,6 +56,9 @@
    @Transactional(rollbackFor = Exception.class)
    public Result add(YwUnitForm form) {
        YwUnit entity = YwUnitForm.getEntityByForm(form, null);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        if(baseMapper.insert(entity) > 0) {
            // 新增运维人员账号
            SysUser sysUser = new SysUser();
@@ -90,10 +90,11 @@
    @Transactional(rollbackFor = Exception.class)
    public Result update(YwUnitForm form) {
        YwUnit entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        Date now = new Date();
        entity.setUpdateTime(now);
        if (baseMapper.updateById(entity) > 0) {
            // 修改运维单位账号信息
            SysUser sysUser = sysUserMapper.selectUserByUserName(entity.getUnitAdminAccount());

 ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml

@@ -5,10 +5,9 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.PlatformVO">
        <result column="platform_name" property="platformName" />
        <result column="platform_contact" property="platformContact" />
        <result column="platform_contact_phone" property="platformContactPhone" />
        <result column="status" property="status" />
        <result column="remark" property="remark" />
        <result column="area" property="area" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>
@@ -22,10 +21,10 @@
    <select id="getById" resultMap="BaseResultMap">
        SELECT
            TP.platform_name,
            TP.platform_contact,
            TP.platform_contact_phone,
            TP.platform_ip,
            TP.status,
            TP.remark,
            TP.area,
            TP.create_time,
            TP.update_time,
            TP.id
@@ -39,9 +38,9 @@
    <select id="getPage" resultMap="BaseResultMap">
        SELECT
            TP.platform_name,
            TP.platform_contact,
            TP.platform_contact_phone,
            TP.platform_ip,
            TP.status,
            TP.area,
            TP.remark,
            TP.create_time,
            TP.update_time,