Browse Source

相关信息的默认填充

aqm-ops-supervision-platform
gjh 4 days ago
parent
commit
8978e4dd4d
  1. 8
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/StationInfoController.java
  2. 6
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IStationInfoService.java
  3. 24
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java
  4. 22
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java
  5. 18
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WorkOrderInfoServiceImpl.java

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

@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.demo.domain.vo.RegionVo; import org.dromara.demo.domain.vo.RegionVo;
import org.dromara.demo.domain.vo.StationSelectVo;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -118,4 +119,11 @@ public class StationInfoController extends BaseController {
public R<String> getStationNameById(String stationId) { public R<String> getStationNameById(String stationId) {
return R.ok("获取子站名称",stationInfoService.getStationNameById(stationId)); return R.ok("获取子站名称",stationInfoService.getStationNameById(stationId));
} }
@GetMapping("/getStationList")
public R< List<StationSelectVo>> getStationList() {
List<StationSelectVo> stationList = stationInfoService.getStationList();
return R.ok(stationList);
}
} }

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

@ -5,6 +5,7 @@ import org.dromara.demo.domain.vo.StationInfoVo;
import org.dromara.demo.domain.bo.StationInfoBo; import org.dromara.demo.domain.bo.StationInfoBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.demo.domain.vo.StationSelectVo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -70,4 +71,9 @@ public interface IStationInfoService {
List<RegionVo> getHangzhouRegions(); List<RegionVo> getHangzhouRegions();
String getStationNameById(String stationId); String getStationNameById(String stationId);
String getAreaByStationName(String stationName);
List<StationSelectVo> getStationList();
} }

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

@ -1,5 +1,6 @@
package org.dromara.demo.service.impl; package org.dromara.demo.service.impl;
import jakarta.annotation.Resource;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.demo.domain.vo.PlanSelectVo; import org.dromara.demo.domain.vo.PlanSelectVo;
import org.dromara.demo.service.IStationInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.PlanInfoBo; import org.dromara.demo.domain.bo.PlanInfoBo;
import org.dromara.demo.domain.vo.PlanInfoVo; import org.dromara.demo.domain.vo.PlanInfoVo;
@ -31,6 +33,8 @@ public class PlanInfoServiceImpl implements IPlanInfoService {
private final PlanInfoMapper baseMapper; private final PlanInfoMapper baseMapper;
@Resource
private IStationInfoService stationInfoService;
/** /**
* 查询计划管理 * 查询计划管理
* *
@ -87,12 +91,28 @@ public class PlanInfoServiceImpl implements IPlanInfoService {
/** /**
* 新增计划管理 * 新增计划管理
* *
* @param bo 计划管理 * @param bo 管理
* @return 是否新增成功 * @return 是否新增成功
*/ */
@Override @Override
public Boolean insertByBo(PlanInfoBo bo) { public Boolean insertByBo(PlanInfoBo bo) {
//List<String> ioPersonList = Arrays.asList("电信", "移动","盈力");
// TODO 计划默认值插入
String stationName = bo.getStation();
bo.setStatus("正常");
bo.setIoCompany("杭州聚光");
bo.setMonitorCompany("宁波国研");
bo.setIoPerson("吴昊");
String area = stationInfoService.getAreaByStationName(stationName);
bo.setArea(area);
// 模拟生成计划编号
long timeInMillis = System.currentTimeMillis();
int last6Digits = (int) (timeInMillis % 1000000); // 取后6位毫秒数
String planNum = new SimpleDateFormat("yyMMdd").format(new Date()) +
String.format("%06d", last6Digits);
bo.setPlanNum(planNum);
PlanInfo add = MapstructUtils.convert(bo, PlanInfo.class); PlanInfo add = MapstructUtils.convert(bo, PlanInfo.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
@ -155,7 +175,7 @@ public class PlanInfoServiceImpl implements IPlanInfoService {
String monitorType = planInfoVo.getMonitorType(); String monitorType = planInfoVo.getMonitorType();
// 需要拼接: 街道名称 (计划日期,监理类型) 得到rs // 需要拼接: 街道名称 (计划日期,监理类型) 得到rs
String rs = String.format("%s (%s, %s)", station, formattedDate, monitorType); String rs = String.format("%s (%s, %s)", station, formattedDate, monitorType);
planSelectVo.setLable(rs); planSelectVo.setLabel(rs);
planSelectVo.setValue(planId); planSelectVo.setValue(planId);
list.add(planSelectVo); list.add(planSelectVo);
} }

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

@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.demo.domain.bo.DeviceInfoBo;
import org.dromara.demo.domain.vo.DeviceInfoVo;
import org.dromara.demo.domain.vo.RegionVo; import org.dromara.demo.domain.vo.RegionVo;
import org.dromara.demo.domain.vo.StationSelectVo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.StationInfoBo; import org.dromara.demo.domain.bo.StationInfoBo;
import org.dromara.demo.domain.vo.StationInfoVo; import org.dromara.demo.domain.vo.StationInfoVo;
@ -163,4 +166,23 @@ public class StationInfoServiceImpl implements IStationInfoService {
StationInfo stationInfo = baseMapper.selectById(stationId); StationInfo stationInfo = baseMapper.selectById(stationId);
return stationInfo.getStation(); return stationInfo.getStation();
} }
@Override
public String getAreaByStationName(String stationName) {
LambdaQueryWrapper<StationInfo> qw = new LambdaQueryWrapper<>();
qw.eq(StationInfo::getStation, stationName)
.last("LIMIT 1");
StationInfo stationInfo = baseMapper.selectOne(qw);
if (stationInfo != null) {
return stationInfo.getArea();
}
return null;
}
@Override
public List<StationSelectVo> getStationList() {
List<StationInfoVo> stationInfoVos = this.queryList(new StationInfoBo());
List<String> values = stationInfoVos.stream().map(StationInfoVo::getStation).distinct().toList();
return values.stream().map(StationSelectVo::new).toList();
}
} }

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

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.demo.domain.bo.PlanInfoBo; import org.dromara.demo.domain.bo.PlanInfoBo;
import org.dromara.demo.domain.vo.PlanInfoVo;
import org.dromara.demo.mapper.PlanInfoMapper; import org.dromara.demo.mapper.PlanInfoMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.WorkOrderInfoBo; import org.dromara.demo.domain.bo.WorkOrderInfoBo;
@ -18,6 +19,8 @@ import org.dromara.demo.domain.WorkOrderInfo;
import org.dromara.demo.mapper.WorkOrderInfoMapper; import org.dromara.demo.mapper.WorkOrderInfoMapper;
import org.dromara.demo.service.IWorkOrderInfoService; import org.dromara.demo.service.IWorkOrderInfoService;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
@ -97,6 +100,21 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
*/ */
@Override @Override
public Boolean insertByBo(WorkOrderInfoBo bo) { public Boolean insertByBo(WorkOrderInfoBo bo) {
String planId = bo.getPlanId();
PlanInfoVo planInfoVo = planInfoService.queryById(planId);
bo.setWorkDate(planInfoVo.getPlanDate());
bo.setStation(planInfoVo.getStation());
bo.setStatus(planInfoVo.getStatus());
bo.setMonitorType(planInfoVo.getMonitorType());
long timeInMillis = System.currentTimeMillis();
int last6Digits = (int) (timeInMillis % 1000000); // 后6位毫秒
String datePart = new SimpleDateFormat("yyMMdd").format(new Date()); // 日期部分
String randomPart = String.format("%06d", last6Digits); // 6位时间戳后缀
String orderNum = "WO-" + datePart +"-" +randomPart; // 拼接前缀 WO-
bo.setOrderNum(orderNum);
System.out.println(orderNum); // 输出示例:WO-250714-382914
WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class); WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;

Loading…
Cancel
Save