diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java b/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java index fc99bc96..d75ad4fc 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java @@ -137,4 +137,9 @@ public class DcEmployeesController extends BaseController return AjaxResult.success(dcEmployeesService.selectEmployeesPostAll()); } + //定时任务,获取值班信息定义人员归属岗位 + @PostMapping("/personnelPositions") + public AjaxResult personnelPositions(){ + return toAjax(dcEmployeesService.personnelPositions()); + } } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcEmployeesMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcEmployeesMapper.java index fc807eb2..602f1982 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcEmployeesMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcEmployeesMapper.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import com.zc.business.domain.DcEmployees; +import org.apache.ibatis.annotations.Param; /** * 值班人员信息Mapper接口 @@ -71,4 +72,8 @@ public interface DcEmployeesMapper public List> selectEmployeesPost(); //获取全部用户信息，以及所在岗位信息 public List> selectEmployeesPostAll(); + //查询当天的岗位信息 + public List> selectJobInformation(@Param("date")String date); + //循环改变人员岗位 + public Integer updateJobInformation(@Param("employeesId")Long employeesId,@Param("station")Long station); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcEmployeesService.java b/zc-business/src/main/java/com/zc/business/service/IDcEmployeesService.java index 296c0a32..f76ec7b4 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcEmployeesService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcEmployeesService.java @@ -69,4 +69,6 @@ public interface IDcEmployeesService public Map>> selectEmployeesPost(); //获取全部用户信息，以及所在岗位信息 public List> selectEmployeesPostAll(); + //定时任务,获取值班信息定义人员归属岗位 + public int personnelPositions(); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java index 1b193f89..ba50429b 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java @@ -120,4 +120,19 @@ public class DcEmployeesServiceImpl implements IDcEmployeesService { return dcEmployeesMapper.selectEmployeesPostAll(); } + //定时任务,获取值班信息定义人员归属岗位 + @Override + public int personnelPositions() { + String date = DateUtils.getDate(); + List> mapList = dcEmployeesMapper.selectJobInformation(date); + if (mapList==null){ + return 1; + } + for (HashMapmap:mapList){ + Long employeesId = (Long) map.get("employeesId"); + Long station = (Long) map.get("station"); + dcEmployeesMapper.updateJobInformation(employeesId,station); + } + return 1; + } } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java index f481ae29..f37afff4 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java @@ -181,9 +181,9 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa public List> selectSectionMark(DcWarning dcWarning) { ArrayList numList = new ArrayList<>(); String type = dcWarning.getType(); + HashMap mapNum = new HashMap<>(); List> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning); for (HashMap list:mapList){ - HashMap mapNum = new HashMap<>(); String markId = (String) list.get("stakeMark"); dcWarning.setStakeMark(markId); String sectionNumber=""; @@ -217,6 +217,40 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa } return numList; } +// @Override +// public List> selectSectionMark(DcWarning dcWarning) { +// List> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning); +// +// List> result = new ArrayList<>(); +// for (HashMap list : mapList) { +// String stakeMarkId = list.get("stakeMark").toString(); +// dcWarning.setStakeMark(stakeMarkId); +// switch (dcWarning.getType()) { +// case "day": +// result.add(addSectionNumber( stakeMarkId, perceivedEventsWarningMapper.selectWarningMarkDay(dcWarning))); +// break; +// case "month": +// result.add(addSectionNumber( stakeMarkId, perceivedEventsWarningMapper.selectWarningMarkMonth(dcWarning))); +// break; +// case "quarter": +// result.add(addSectionNumber( stakeMarkId, perceivedEventsWarningMapper.selectWarningMarkQuarter(dcWarning))); +// break; +// case "year": +// result.add(addSectionNumber( stakeMarkId, perceivedEventsWarningMapper.selectWarningMarkYear(dcWarning))); +// break; +// default: +// result.add(addSectionNumber(stakeMarkId, "")); +// } +// } +// return result; +// } +// +// private HashMap addSectionNumber( String stakeMarkId, Object sectionNumber) { +// HashMap mapNum = new HashMap<>(); +// mapNum.put("stakeMarkId", stakeMarkId); +// mapNum.put("sectionNumber", sectionNumber); +// return mapNum; +// } //预警事件,事件列表 查询状态为上报的感知事件 @Override public List> selectWarningEscalation(DcWarning dcWarning) { diff --git a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml index df08e961..08af9b72 100644 --- a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml @@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + delete from dc_employees where id = #{id} @@ -108,4 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" employees.contact_number contactNumber from dc_employees as employees left join sys_post as post on employees.post_id=post.post_id + + + update dc_employees set organization_id=#{station} where employees_id=#{employeesId} + \ No newline at end of file diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index 8e2305d5..b0863075 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -15,7 +15,7 @@