现场核查单管理信息基础接口

ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -75,7 +75,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
         // 例如: 后台用户30分钟过期 app用户1天过期
         //model.setTimeout(client.getTimeout());
-        model.setTimeout(43200L); // 12小时 = 12 * 60 * 60
+        model.setTimeout(4320000L); // 便于测试
         model.setActiveTimeout(client.getActiveTimeout());
         model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
         // 生成token

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/OrderManagementInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.demo.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.demo.domain.vo.OrderManagementInfoVo;
+import org.dromara.demo.domain.bo.OrderManagementInfoBo;
+import org.dromara.demo.service.IOrderManagementInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 现场核查单管理信息
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/air/managementInfo")
+public class OrderManagementInfoController extends BaseController {
+
+    private final IOrderManagementInfoService orderManagementInfoService;
+
+    /**
+     * 查询现场核查单管理信息列表
+     */
+    //@SaCheckPermission("air:managementInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<OrderManagementInfoVo> list(OrderManagementInfoBo bo, PageQuery pageQuery) {
+        return orderManagementInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出现场核查单管理信息列表
+     */
+    //@SaCheckPermission("air:managementInfo:export")
+    @Log(title = "现场核查单管理信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OrderManagementInfoBo bo, HttpServletResponse response) {
+        List<OrderManagementInfoVo> list = orderManagementInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "现场核查单管理信息", OrderManagementInfoVo.class, response);
+    }
+
+    /**
+     * 获取现场核查单管理信息详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("air:managementInfo:query")
+    @GetMapping("/{id}")
+    public R<OrderManagementInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(orderManagementInfoService.queryById(id));
+    }
+
+    /**
+     * 新增现场核查单管理信息
+     */
+    //@SaCheckPermission("air:managementInfo:add")
+    @Log(title = "现场核查单管理信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderManagementInfoBo bo) {
+        return toAjax(orderManagementInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改现场核查单管理信息
+     */
+    //@SaCheckPermission("air:managementInfo:edit")
+    @Log(title = "现场核查单管理信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderManagementInfoBo bo) {
+        return toAjax(orderManagementInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除现场核查单管理信息
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("air:managementInfo:remove")
+    @Log(title = "现场核查单管理信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(orderManagementInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/StationInfoController.java

@@ -112,4 +112,10 @@ public class StationInfoController extends BaseController {
     public R<List<RegionVo>> getHangzhouRegions() {
         return R.ok(stationInfoService.getHangzhouRegions());
     }
+
+
+    @GetMapping("/getStationNameById")
+    public R<String> getStationNameById(String stationId) {
+        return R.ok("获取子站名称",stationInfoService.getStationNameById(stationId));
+    }
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/OrderManagementInfo.java

@@ -0,0 +1,86 @@
+package org.dromara.demo.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+
+/**
+ * 现场核查单管理信息对象 order_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("order_management_info")
+public class OrderManagementInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 核查时间
+     */
+    private Date checkTime;
+
+    /**
+     * 子站名称
+     */
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    private String area;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 监理类型
+     */
+    private String superviseType;
+
+    /**
+     * 核查人员
+     */
+    private String checkPerson;
+
+    /**
+     * 核查得分
+     */
+    private Long checkScore;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/OrderManagementInfoBo.java

@@ -0,0 +1,92 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.OrderManagementInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 现场核查单管理信息业务对象 order_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = OrderManagementInfo.class, reverseConvertGenerate = false)
+public class OrderManagementInfoBo extends BaseEntity {
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    //@NotBlank(message = "主键ID（MyBatis-Plus自增）不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 核查时间
+     */
+    //@NotNull(message = "核查时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkTime;
+
+    /**
+     * 子站名称
+     */
+    //@NotBlank(message = "子站名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String area;
+
+    /**
+     * 状态
+     */
+    //@NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 监理类型
+     */
+    //@NotBlank(message = "监理类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String superviseType;
+
+    /**
+     * 核查人员
+     */
+    //@NotBlank(message = "核查人员不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String checkPerson;
+
+    /**
+     * 核查得分
+     */
+    //@NotNull(message = "核查得分不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long checkScore;
+
+    /**
+     * 子站ID
+     */
+    private String stationId;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/OrderManagementInfoVo.java

@@ -0,0 +1,83 @@
+package org.dromara.demo.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.demo.domain.OrderManagementInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 现场核查单管理信息视图对象 order_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = OrderManagementInfo.class)
+public class OrderManagementInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "M=yBatis-Plus自增")
+    private String id;
+
+    /**
+     * 核查时间
+     */
+    @ExcelProperty(value = "核查时间")
+    private Date checkTime;
+
+    /**
+     * 子站名称
+     */
+    @ExcelProperty(value = "子站名称")
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    @ExcelProperty(value = "所属区域")
+    private String area;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 监理类型
+     */
+    @ExcelProperty(value = "监理类型")
+    private String superviseType;
+
+    /**
+     * 核查人员
+     */
+    @ExcelProperty(value = "核查人员")
+    private String checkPerson;
+
+    /**
+     * 核查得分
+     */
+    @ExcelProperty(value = "核查得分")
+    private Long checkScore;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/OrderManagementInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.OrderManagementInfo;
+import org.dromara.demo.domain.vo.OrderManagementInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 现场核查单管理信息Mapper接口
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+public interface OrderManagementInfoMapper extends BaseMapperPlus<OrderManagementInfo, OrderManagementInfoVo> {
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IOrderManagementInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.vo.OrderManagementInfoVo;
+import org.dromara.demo.domain.bo.OrderManagementInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 现场核查单管理信息Service接口
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+public interface IOrderManagementInfoService {
+
+    /**
+     * 查询现场核查单管理信息
+     *
+     * @param id 主键
+     * @return 现场核查单管理信息
+     */
+    OrderManagementInfoVo queryById(String id);
+
+    /**
+     * 分页查询现场核查单管理信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 现场核查单管理信息分页列表
+     */
+    TableDataInfo<OrderManagementInfoVo> queryPageList(OrderManagementInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的现场核查单管理信息列表
+     *
+     * @param bo 查询条件
+     * @return 现场核查单管理信息列表
+     */
+    List<OrderManagementInfoVo> queryList(OrderManagementInfoBo bo);
+
+    /**
+     * 新增现场核查单管理信息
+     *
+     * @param bo 现场核查单管理信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(OrderManagementInfoBo bo);
+
+    /**
+     * 修改现场核查单管理信息
+     *
+     * @param bo 现场核查单管理信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(OrderManagementInfoBo bo);
+
+    /**
+     * 校验并批量删除现场核查单管理信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IStationInfoService.java

@@ -68,4 +68,6 @@ public interface IStationInfoService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<RegionVo> getHangzhouRegions();
+
+    String getStationNameById(String stationId);
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/OrderManagementInfoServiceImpl.java

@@ -0,0 +1,156 @@
+package org.dromara.demo.service.impl;
+
+import jakarta.annotation.Resource;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.demo.service.IStationInfoService;
+import org.springframework.stereotype.Service;
+import org.dromara.demo.domain.bo.OrderManagementInfoBo;
+import org.dromara.demo.domain.vo.OrderManagementInfoVo;
+import org.dromara.demo.domain.OrderManagementInfo;
+import org.dromara.demo.mapper.OrderManagementInfoMapper;
+import org.dromara.demo.service.IOrderManagementInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 现场核查单管理信息Service业务层处理
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@RequiredArgsConstructor
+@Service
+public class OrderManagementInfoServiceImpl implements IOrderManagementInfoService {
+
+    private final OrderManagementInfoMapper baseMapper;
+
+    @Resource
+    private IStationInfoService stationInfoService;
+
+    /**
+     * 查询现场核查单管理信息
+     *
+     * @param id 主键
+     * @return 现场核查单管理信息
+     */
+    @Override
+    public OrderManagementInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询现场核查单管理信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 现场核查单管理信息分页列表
+     */
+    @Override
+    public TableDataInfo<OrderManagementInfoVo> queryPageList(OrderManagementInfoBo bo, PageQuery pageQuery) {
+        // 映射
+        if (bo.getStationId() != null){
+            String stationName = stationInfoService.getStationNameById(bo.getStationId());
+            bo.setStation(stationName);
+        }
+
+        LambdaQueryWrapper<OrderManagementInfo> lqw = buildQueryWrapper(bo);
+        Page<OrderManagementInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的现场核查单管理信息列表
+     *
+     * @param bo 查询条件
+     * @return 现场核查单管理信息列表
+     */
+    @Override
+    public List<OrderManagementInfoVo> queryList(OrderManagementInfoBo bo) {
+        LambdaQueryWrapper<OrderManagementInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<OrderManagementInfo> buildQueryWrapper(OrderManagementInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OrderManagementInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCheckTime() != null, OrderManagementInfo::getCheckTime, bo.getCheckTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getStation()), OrderManagementInfo::getStation, bo.getStation());
+        lqw.eq(StringUtils.isNotBlank(bo.getArea()), OrderManagementInfo::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), OrderManagementInfo::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getSuperviseType()), OrderManagementInfo::getSuperviseType, bo.getSuperviseType());
+        lqw.eq(StringUtils.isNotBlank(bo.getCheckPerson()), OrderManagementInfo::getCheckPerson, bo.getCheckPerson());
+        lqw.eq(bo.getCheckScore() != null, OrderManagementInfo::getCheckScore, bo.getCheckScore());
+        // 添加时间范围查询
+        lqw.between(
+            bo.getStartDate() != null && bo.getEndDate() != null,
+            OrderManagementInfo::getCheckTime,
+            bo.getStartDate(),
+            bo.getEndDate()
+        );
+        // 添加按创建时间降序排序
+        lqw.orderByDesc(OrderManagementInfo::getCreateTime);
+
+        return lqw;
+    }
+
+    /**
+     * 新增现场核查单管理信息
+     *
+     * @param bo 现场核查单管理信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(OrderManagementInfoBo bo) {
+        OrderManagementInfo add = MapstructUtils.convert(bo, OrderManagementInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改现场核查单管理信息
+     *
+     * @param bo 现场核查单管理信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(OrderManagementInfoBo bo) {
+        OrderManagementInfo update = MapstructUtils.convert(bo, OrderManagementInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(OrderManagementInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除现场核查单管理信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java

@@ -157,4 +157,10 @@ public class StationInfoServiceImpl implements IStationInfoService {
 
         return regions;
     }
+
+    @Override
+    public String getStationNameById(String stationId) {
+        StationInfo stationInfo = baseMapper.selectById(stationId);
+        return stationInfo.getStation();
+    }
 }