From cb4d38c5ed5bb7e5c9a261bce73e00cf2b856560 Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Thu, 29 Feb 2024 19:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A9=E5=8F=B7=E5=BD=92=E5=B1=9E=E8=B7=AF?= =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86,=E5=BA=94?= =?UTF-8?q?=E6=80=A5=E4=BA=BA=E5=91=98=E5=AF=BC=E5=87=BA=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A8=AA=E5=9D=90=E6=A0=87=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcRoadSectionController.java | 8 ++ .../com/zc/business/domain/DcEmployees.java | 4 +- .../business/mapper/DcRoadSectionMapper.java | 7 ++ .../service/IDcRoadSectionService.java | 2 + .../impl/DcRoadSectionServiceImpl.java | 25 +++++ .../service/impl/DcShiftsServiceImpl.java | 75 ++++++++------ .../DcPerceivedEventsWarningMapper.xml | 98 ++++++++++++------- .../mapper/business/DcRoadSectionMapper.xml | 16 +++ 8 files changed, 168 insertions(+), 67 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java b/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java index 44e9f2a9..4acd42b5 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java @@ -128,4 +128,12 @@ public class DcRoadSectionController extends BaseController public AjaxResult roadList(){ return AjaxResult.success(dcRoadSectionService.selectRoadList()); } + + + //处理桩号归属的路段id + @PostMapping("/selectMileage") + public AjaxResult selectMileage(){ + dcRoadSectionService.selectMileage(); + return AjaxResult.success(); + } } diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java b/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java index b28b3290..ebc54b15 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEmployees.java @@ -21,12 +21,12 @@ public class DcEmployees extends BaseEntity /** $column.columnComment */ @ApiModelProperty("所属岗位") - @Excel(name = "所属岗位") +// @Excel(name = "所属岗位") private String postId; /** $column.columnComment */ @ApiModelProperty("所属机构") - @Excel(name = "所属机构") +// @Excel(name = "所属机构") private Long organizationId; /** */ diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcRoadSectionMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcRoadSectionMapper.java index 02913bcb..3bac0457 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcRoadSectionMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcRoadSectionMapper.java @@ -3,6 +3,7 @@ package com.zc.business.mapper; import java.util.HashMap; import java.util.List; import com.zc.business.domain.DcRoadSection; +import org.apache.ibatis.annotations.Param; /** * 辖区路段Mapper接口 @@ -61,4 +62,10 @@ public interface DcRoadSectionMapper int deleteDcRoadSectionByIds(Long[] ids); //查询路线id与名称 List> selectRoadList(); + //查询桩号里程后的数据(路段) + List> selectMileage(); + //查询桩号里程后的数据(桩号) + List> selectStakeMarkMileage(); + //修改桩号归属路段id + int updateStakeMarkRecord(@Param("sectionId") Long sectionId,@Param("stakeMark") String stakeMark); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcRoadSectionService.java b/zc-business/src/main/java/com/zc/business/service/IDcRoadSectionService.java index 1ac7333c..958019ff 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcRoadSectionService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcRoadSectionService.java @@ -61,4 +61,6 @@ public interface IDcRoadSectionService int deleteDcRoadSectionById(Long id); //查询路线id与名称 List> selectRoadList(); + //处理桩号归属的路段id + void selectMileage(); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcRoadSectionServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcRoadSectionServiceImpl.java index 5864271d..87403f26 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcRoadSectionServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcRoadSectionServiceImpl.java @@ -147,4 +147,29 @@ public class DcRoadSectionServiceImpl implements IDcRoadSectionService public List> selectRoadList() { return dcRoadSectionMapper.selectRoadList(); } + //处理桩号归属的路段id + @Override + public void selectMileage() { + List> sectionListValue = dcRoadSectionMapper.selectMileage();//路段集合 + List> stakeMarkListValue = dcRoadSectionMapper.selectStakeMarkMileage();//桩号集合 + + for (HashMap stakeMarkList:stakeMarkListValue ){ + String stakeMarkRecord = stakeMarkList.get("startStakeMark").toString();//桩号 + String stakeMarkString = stakeMarkList.get("stakeMark").toString();//桩号里程 + Integer stakeMark = Integer.valueOf(stakeMarkString); + + for (HashMapsectionList:sectionListValue){ + String startStakeMarkString = sectionList.get("startStakeMark").toString();//开始 + Integer startStakeMark = Integer.valueOf(startStakeMarkString); + String endStakeMarkString = sectionList.get("endStakeMark").toString();//结束 + Integer endStakeMark = Integer.valueOf(endStakeMarkString); + if (startStakeMark<=stakeMark&&stakeMark<=endStakeMark){ + Long sectionId = (Long) sectionList.get("id"); + dcRoadSectionMapper.updateStakeMarkRecord(sectionId,stakeMarkRecord); + }else { + continue; + } + } + } + } } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java index b0907ba6..117e969d 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java @@ -73,21 +73,39 @@ public class DcShiftsServiceImpl implements IDcShiftsService @Override public List selectDcShiftsList(DcShifts dcShifts) { - + String name = org.apache.commons.lang3.StringUtils.isNotBlank(dcShifts.getName())?dcShifts.getName():null; List list = dcShiftsMapper.selectDcShiftsList(dcShifts); for (DcShifts shifts:list ){ - String name=""; Date date = shifts.getDate(); Long station = shifts.getStation(); - if (org.apache.commons.lang3.StringUtils.isNotBlank(dcShifts.getName())){ - name=dcShifts.getName(); - } List organizationName = dcShiftsMapper.selectStationDate(station, date,name); shifts.setShiftsList(organizationName); } return list; } - +// public List selectDcShiftsList(DcShifts dcShifts) { +// List list = dcShiftsMapper.selectDcShiftsList(dcShifts); +// +// // 创建一个映射，用于存储station-date-name到DcShiftsList的映射 +// Map> organizationNameMap = new HashMap<>(); +// +// // 一次性获取所有DcShiftsList，并根据station-date-name进行分组 +// for (DcShifts shifts : list) { +// Date date = shifts.getDate(); +// Long station = shifts.getStation(); +// String key = station + "-" + date.getTime() + "-" + (org.apache.commons.lang3.StringUtils.isNotBlank(dcShifts.getName()) ? dcShifts.getName() : ""); +// organizationNameMap.put(key, dcShiftsMapper.selectStationDate(station, date, dcShifts.getName())); +// } +// // 设置shifts的shiftsList +// for (DcShifts shifts : list) { +// Date date = shifts.getDate(); +// Long station = shifts.getStation(); +// String key = station + "-" + date.getTime() + "-" + (org.apache.commons.lang3.StringUtils.isNotBlank(dcShifts.getName()) ? dcShifts.getName() : ""); +// shifts.setShiftsList(organizationNameMap.get(key)); +// } +// +// return list; +// } @Override public List selectDcShiftsListExcel(DcShifts dcShifts) { @@ -119,29 +137,30 @@ public class DcShiftsServiceImpl implements IDcShiftsService if (aLong!=0){ continue; } + dcShifts.setCreateTime(DateUtils.getNowDate()); + int shifts = dcShiftsMapper.insertDcShifts(dcShifts); + if (shifts==0){ + msg="新增用户信息失败"; + throw new ServiceException(msg); + } + DcShiftsRecord dcShiftsRecord = new DcShiftsRecord(); + dcShiftsRecord.setOperator(SecurityUtils.getUserId());//操作人员id + dcShiftsRecord.setOperationType("Add");//操作类型 + dcShiftsRecord.setOperationTime(DateUtils.getNowDate());//操作时间 + dcShiftsRecord.setShiftsDate(dcShifts.getDate());//值班日期 + Long employeesIdS = dcShifts.getEmployeesId();//新增人员id + DcEmployees dcEmployees = dcEmployeesMapper.selectDcEmployeesById(employeesIdS); + String name = dcEmployees.getName();//新增人员名称 + dcShiftsRecord.setModifyContent("新增值班人员"+name); + dcShifts.setCreateTime(DateUtils.getNowDate()); + dcShiftsRecord.setStation(station);//驻点 + int shiftsRecord = dcShiftsMapper.insertDcShiftsRecord(dcShiftsRecord); + if (shiftsRecord==0){ + msg="操作日志记录失败"; + throw new ServiceException(msg); + } } - dcShifts.setCreateTime(DateUtils.getNowDate()); - int shifts = dcShiftsMapper.insertDcShifts(dcShifts); - if (shifts==0){ - msg="新增用户信息失败"; - throw new ServiceException(msg); - } - DcShiftsRecord dcShiftsRecord = new DcShiftsRecord(); - dcShiftsRecord.setOperator(SecurityUtils.getUserId());//操作人员id - dcShiftsRecord.setOperationType("Add");//操作类型 - dcShiftsRecord.setOperationTime(DateUtils.getNowDate());//操作时间 - dcShiftsRecord.setShiftsDate(dcShifts.getDate());//值班日期 - Long employeesIdS = dcShifts.getEmployeesId();//新增人员id - DcEmployees dcEmployees = dcEmployeesMapper.selectDcEmployeesById(employeesIdS); - String name = dcEmployees.getName();//新增人员名称 - dcShiftsRecord.setModifyContent("新增值班人员"+name); - dcShifts.setCreateTime(DateUtils.getNowDate()); - dcShiftsRecord.setStation(station);//驻点 - int shiftsRecord = dcShiftsMapper.insertDcShiftsRecord(dcShiftsRecord); - if (shiftsRecord==0){ - msg="操作日志记录失败"; - throw new ServiceException(msg); - } + } return 1; } diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index e88c121a..167fc1b8 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -46,29 +46,42 @@ order by warning.warning_time desc diff --git a/zc-business/src/main/resources/mapper/business/DcRoadSectionMapper.xml b/zc-business/src/main/resources/mapper/business/DcRoadSectionMapper.xml index f0e6aa29..6d75acd9 100644 --- a/zc-business/src/main/resources/mapper/business/DcRoadSectionMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcRoadSectionMapper.xml @@ -64,6 +64,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + update dc_stake_mark set section_id=#{sectionId} where stake_mark=#{stakeMark} + insert into dc_road_section