xiangpei
2024-03-19 12c86527701af61593ab16aa322c3f7dd08aa019
报备、添加运维人员增加账号
7个文件已修改
9个文件已添加
667 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPeople.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/ReportMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
New file
@@ -0,0 +1,55 @@
package com.ycl.platform.domain.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 报备
 *
 * @author xp
 * @since 2024-03-19
 */
@Data
@Accessors(chain = true)
@TableName("t_report")
@ApiModel(value = "Report对象", description = "报备")
public class Report extends AbsEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("运维单位ID")
    @TableField("unit_id")
    private Integer unitId;
    @ApiModelProperty("运维人员ID")
    @TableField("people_id")
    private Integer peopleId;
    @ApiModelProperty("点位ID")
    @TableField("point_id")
    private Integer pointId;
    @ApiModelProperty("审核时间")
    @TableField("auditing_time")
    private LocalDateTime auditingTime;
    @ApiModelProperty("报备内容")
    @TableField("report_content")
    private String reportContent;
    @ApiModelProperty("上报材料")
    @TableField("report_materials")
    private String reportMaterials;
    @ApiModelProperty("故障类型")
    @TableField("error_type")
    private String errorType;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPeople.java
@@ -51,4 +51,7 @@
    @TableField("remark")
    private String remark;
    @TableField("user_id")
    private Long userId;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
New file
@@ -0,0 +1,58 @@
package com.ycl.platform.domain.form;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.Report;
import java.time.LocalDateTime;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 报备表单
 *
 * @author xp
 * @since 2024-03-19
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "Report表单", description = "报备表单")
public class ReportForm extends AbsForm {
    private Integer unitId;
    private Integer peopleId;
    @NotNull(message = "点位不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("点位")
    private Integer pointId;
    @ApiModelProperty("审核时间")
    private LocalDateTime auditingTime;
    @NotBlank(message = "报备内容不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("报备内容")
    private String reportContent;
    @NotBlank(message = "上报材料不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("上报材料")
    private String reportMaterials;
    @ApiModelProperty("故障类型")
    private String errorType;
    public static Report getEntityByForm(@NonNull ReportForm form, Report entity) {
        if(entity == null) {
          entity = new Report();
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }
}
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
New file
@@ -0,0 +1,23 @@
package com.ycl.platform.domain.query;
import com.ycl.platform.base.AbsQuery;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 报备查询
 *
 * @author xp
 * @since 2024-03-19
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "Report查询", description = "报备查询")
public class ReportQuery extends AbsQuery {
}
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
New file
@@ -0,0 +1,56 @@
package com.ycl.platform.domain.vo;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.Report;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 报备展示
 *
 * @author xp
 * @since 2024-03-19
 */
@Data
@Accessors(chain = true)
public class ReportVO extends AbsVo {
    /** 运维单位ID */
    private Integer unitId;
    private String unitName;
    /** 运维人员ID */
    private Integer peopleId;
    private String peopleName;
    /** 点位ID */
    private Integer pointId;
    private String pointName;
    /** 审核时间 */
    private LocalDateTime auditingTime;
    /** 报备内容 */
    private String reportContent;
    /** 上报材料 */
    private String reportMaterials;
    /** 故障类型 */
    private String errorType;
    public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
        if(vo == null) {
            vo = new ReportVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }
}
ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
New file
@@ -0,0 +1,75 @@
package com.ycl.platform.controller;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
 * 报备 前端控制器
 *
 * @author xp
 * @since 2024-03-19
 */
@Validated
@RequiredArgsConstructor
@Api(value = "报备", tags = "报备管理")
@RestController
@RequestMapping("/report")
public class ReportController {
    private final ReportService reportService;
    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) ReportForm form) {
        return reportService.add(form);
    }
    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) ReportForm form) {
        return reportService.update(form);
    }
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
        return reportService.removeById(id);
    }
    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return reportService.remove(ids);
    }
    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(ReportQuery query) {
        return reportService.page(query);
    }
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    public Result detail(@PathVariable("id") String id) {
        return reportService.detail(id);
    }
    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return reportService.all();
    }
}
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -3,6 +3,7 @@
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import jakarta.validation.constraints.NotBlank;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
@@ -87,4 +88,10 @@
    public Result list() {
        return ywPointService.all();
    }
    @GetMapping("/select")
    @ApiOperation(value = "点位下拉", notes = "点位下拉")
    public Result select(@NotBlank(message = "请输入点位") String keyword) {
        return ywPointService.select(keyword);
    }
}
ycl-server/src/main/java/com/ycl/platform/mapper/ReportMapper.java
New file
@@ -0,0 +1,19 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.form.ReportForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
/**
 * 报备 Mapper 接口
 *
 * @author xp
 * @since 2024-03-19
 */
@Mapper
public interface ReportMapper extends BaseMapper<Report> {
}
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -1,11 +1,15 @@
package com.ycl.platform.mapper;
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.YwPoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.domain.form.YwPointForm;
import java.util.List;
import com.ycl.system.Result;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
 * 运维点位 Mapper 接口
@@ -16,4 +20,11 @@
@Mapper
public interface YwPointMapper extends BaseMapper<YwPoint> {
    /**
     * 下拉数据
     * @param keyword
     * @param unitId
     * @return
     */
    List<BaseSelect> selectData(@Param("keyword") String keyword, @Param("unitId") Integer unitId);
}
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
New file
@@ -0,0 +1,65 @@
package com.ycl.platform.service;
import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import java.util.List;
/**
 * 报备 服务类
 *
 * @author xp
 * @since 2024-03-19
 */
public interface ReportService extends IService<Report> {
    /**
     * 添加
     * @param form
     * @return
     */
    Result add(ReportForm form);
    /**
     * 修改
     * @param form
     * @return
     */
    Result update(ReportForm form);
    /**
     * 批量删除
     * @param ids
     * @return
     */
    Result remove(List<String> ids);
    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);
    /**
     * 分页查询
     * @param query
     * @return
     */
    Result page(ReportQuery query);
    /**
     * 根据id查找
     * @param id
     * @return
     */
    Result detail(String id);
    /**
     * 列表
     * @return
     */
    Result all();
}
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -77,4 +77,12 @@
     * @return
     */
    Result batchEdit(BatchEditPointForm form);
    /**
     * 点位下拉
     *
     * @param keyword
     * @return
     */
    Result select(String keyword);
}
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
New file
@@ -0,0 +1,163 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.Region;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.RegionMapper;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.query.ReportQuery;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
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.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
/**
 * 报备 服务实现类
 *
 * @author xp
 * @since 2024-03-19
 */
@Service
@RequiredArgsConstructor
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
    private final ReportMapper reportMapper;
    private final YwUnitMapper unitMapper;
    private final YwPeopleMapper peopleMapper;
    private final RegionMapper regionMapper;
    /**
     * 添加
     * @param form
     * @return
     */
    @Override
    public Result add(ReportForm form) {
        Report entity = ReportForm.getEntityByForm(form, null);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        }
        return Result.error("添加失败");
    }
    /**
     * 修改
     * @param form
     * @return
     */
    @Override
    public Result update(ReportForm form) {
        Report entity = baseMapper.selectById(form.getId());
        // 为空抛IllegalArgumentException,做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        }
        return Result.error("修改失败");
    }
    /**
     * 批量删除
     * @param ids
     * @return
     */
    @Override
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * id删除
     * @param id
     * @return
     */
    @Override
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * 分页查询
     * @param query
     * @return
     */
    @Override
    public Result page(ReportQuery query) {
        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));
        List<ReportVO> vos = page.getRecords().stream()
                .map(
                        entity -> {
                            ReportVO vo = ReportVO.getVoByEntity(entity, null);
                            YwUnit unit = unitMapper.selectById(vo.getUnitId());
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            Region region = regionMapper.selectById(vo.getPointId());
                            vo.setPointName(region.getFullName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }
    /**
     * 根据id查找
     * @param id
     * @return
     */
    @Override
    public Result detail(String id) {
        Report entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        ReportVO vo = ReportVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }
    /**
     * 列表
     * @return
     */
    @Override
    public Result all() {
        List<Report> entities = baseMapper.selectList(null);
        List<ReportVO> vos = entities.stream()
                .map(
                        entity -> ReportVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -13,9 +13,13 @@
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.entity.SysUser;
import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.page.PageUtil;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.Objects;
@@ -37,6 +41,8 @@
    private final YwPeopleMapper ywPeopleMapper;
    private final YwUnitMapper ywUnitMapper;
    private final PasswordEncoder passwordEncoder;
    private final SysUserMapper sysUserMapper;
    /**
     * 添加
@@ -44,8 +50,15 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result add(YwPeopleForm form) {
        // 为运维人员添加账号
        SysUser sysUser = new SysUser();
        fullUser(sysUser, form);
        sysUserMapper.insertUser(sysUser);
        YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
        entity.setUserId(sysUser.getUserId());
        entity.setAddWay("manual");
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
@@ -54,17 +67,37 @@
    }
    /**
     * 赋值user
     * @param sysUser
     * @param form
     */
    public void fullUser(SysUser sysUser, YwPeopleForm form) {
        sysUser.setUserName(form.getYwPersonAccount());
        sysUser.setPassword(passwordEncoder.encode("123456"));
        sysUser.setStatus("0");
        sysUser.setDelFlag("0");
        sysUser.setFirstLogin((short) 0);
        sysUser.setNickName(form.getYwPersonName());
    }
    /**
     * 修改
     * @param form
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result update(YwPeopleForm form) {
        YwPeople entity = baseMapper.selectById(form.getId());
        // 为空抛IllegalArgumentException,做全局异常处理
        Assert.notNull(entity, "记录不存在");
        SysUser sysUser = sysUserMapper.selectUserById(entity.getUserId());
        sysUser.setUserName(form.getYwPersonAccount());
        sysUser.setNickName(form.getYwPersonName());
        sysUserMapper.updateUser(sysUser);
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
@@ -78,11 +111,16 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
        List<YwPeople> list = new LambdaQueryChainWrapper<>(baseMapper)
                .select(YwPeople::getUserId)
                .in(YwPeople::getId, ids)
                .list();
        List<Long> userIds = list.stream().map(YwPeople::getUserId).collect(Collectors.toList());
        baseMapper.deleteBatchIds(ids);
        sysUserMapper.deleteUserByIds((Long[]) userIds.toArray());
        return Result.ok("删除成功");
    }
    /**
@@ -91,11 +129,12 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
        YwPeople ywPeople = baseMapper.selectById(id);
        sysUserMapper.deleteUserById(ywPeople.getUserId());
        baseMapper.deleteById(id);
        return Result.ok("删除成功");
    }
    /**
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,9 +1,14 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.Region;
import com.ycl.platform.domain.entity.YwPeople;
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.RegionMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
@@ -15,12 +20,13 @@
import com.ycl.platform.domain.query.YwPointQuery;
import java.util.List;
import com.ycl.system.entity.SysDept;
import com.ycl.system.entity.SysUser;
import com.ycl.system.service.ISysDeptService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.ycl.utils.SecurityUtils;
import enumeration.general.RegionLevelEnum;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +34,6 @@
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;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;
@@ -44,11 +49,11 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
    private final YwPointMapper ywPointMapper;
    @Autowired
    private ISysDeptService deptService;
    @Autowired
    private YwUnitService unitService;
    private final ISysDeptService deptService;
    private final YwUnitService unitService;
    private final YwUnitMapper ywUnitMapper;
    private final RegionMapper regionMapper;
    private final YwPeopleMapper ywPeopleMapper;
    /**
     * 添加
@@ -194,4 +199,29 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
    @Override
    public Result select(String keyword) {
        Long userId = SecurityUtils.getUserId();
        // 获取当前运维人员的运维单位
        YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper)
                .eq(YwPeople::getUserId, userId)
                .one();
        Integer unitId = null;
        if (Objects.nonNull(people)) {
            unitId = people.getBelongUnit();
        }
        List<Region> list = new LambdaQueryChainWrapper<>(regionMapper)
                .eq(Region::getRegionLevel, RegionLevelEnum.STREET)
                .like(Region::getFullName, keyword)
                .list();
        List<BaseSelect> data = list.stream().map(item -> {
            BaseSelect baseSelect = new BaseSelect();
            baseSelect.setId(item.getId());
            baseSelect.setValue(item.getFullName());
            return baseSelect;
        }).collect(Collectors.toList());
        return Result.ok().data(data);
    }
}
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.ReportMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.ReportVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="unit_id" property="unitId" />
        <result column="people_id" property="peopleId" />
        <result column="point_id" property="pointId" />
        <result column="auditing_time" property="auditingTime" />
        <result column="report_content" property="reportContent" />
        <result column="report_materials" property="reportMaterials" />
        <result column="error_type" property="errorType" />
    </resultMap>
</mapper>
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -13,4 +13,8 @@
        <result column="remark" property="remark" />
    </resultMap>
    <select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
    </select>
</mapper>