值班人员定时

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());
+    }
 }

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<HashMap<String,Object>> selectEmployeesPost();
     //获取全部用户信息，以及所在岗位信息
     public List<HashMap<String,Object>> selectEmployeesPostAll();
+    //查询当天的岗位信息
+    public List<HashMap<String,Object>> selectJobInformation(@Param("date")String date);
+    //循环改变人员岗位
+    public Integer updateJobInformation(@Param("employeesId")Long employeesId,@Param("station")Long station);
 }

zc-business/src/main/java/com/zc/business/service/IDcEmployeesService.java

@@ -69,4 +69,6 @@ public interface IDcEmployeesService
     public  Map<Object, List<Map<String, Object>>> selectEmployeesPost();
     //获取全部用户信息，以及所在岗位信息
     public List<HashMap<String,Object>> selectEmployeesPostAll();
+    //定时任务,获取值班信息定义人员归属岗位
+    public int personnelPositions();
 }

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<HashMap<String, Object>> mapList = dcEmployeesMapper.selectJobInformation(date);
+        if (mapList==null){
+            return 1;
+        }
+        for (HashMap<String,Object>map:mapList){
+            Long employeesId = (Long) map.get("employeesId");
+            Long station = (Long) map.get("station");
+            dcEmployeesMapper.updateJobInformation(employeesId,station);
+        }
+        return 1;
+    }
 }

zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java

@@ -181,9 +181,9 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     public List<HashMap<String, Object>> selectSectionMark(DcWarning dcWarning) {
         ArrayList numList = new ArrayList<>();
         String type = dcWarning.getType();
+        HashMap<String, Object> mapNum = new HashMap<>();
         List<HashMap<String, Object>> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning);
         for (HashMap<String,Object> list:mapList){
-            HashMap<String, Object> 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<HashMap<String, Object>> selectSectionMark(DcWarning dcWarning) {
+//        List<HashMap<String, Object>> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning);
+//
+//        List<HashMap<String, Object>> result = new ArrayList<>();
+//        for (HashMap<String, Object> 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<String, Object> addSectionNumber( String stakeMarkId, Object sectionNumber) {
+//        HashMap<String, Object> mapNum = new HashMap<>();
+//        mapNum.put("stakeMarkId", stakeMarkId);
+//        mapNum.put("sectionNumber", sectionNumber);
+//        return mapNum;
+//    }
     //预警事件,事件列表 查询状态为上报的感知事件
     @Override
     public List<HashMap<String, Object>> selectWarningEscalation(DcWarning dcWarning) {

zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
     <delete id="deleteDcEmployeesById" parameterType="Long">
         delete from dc_employees where id = #{id}
     </delete>
@@ -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
     </select>
+    <select id="selectJobInformation" resultType="java.util.HashMap">
+        select ifnull(employees_id,"") employeesId,ifnull(station,"")station from dc_shifts
+        where date=#{date}
+        group by employees_id
+        order by create_time
+     </select>
+    <update id="updateJobInformation">
+        update dc_employees set  organization_id=#{station} where employees_id=#{employeesId}
+    </update>
 </mapper>

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -15,7 +15,7 @@
     </select>
     <select id="selectWarningById" resultType="com.zc.business.domain.DcWarning">
         SELECT DISTINCT warning.`id`,warning.`stake_mark`, warning.`direction`,
-               mark.longitude,mark.latitude,warning.lane,
+               mark.longitude,mark.latitude,warning.lane,warning.vehicle_type vehicleType,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
                warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
                warning.`remark`, warning.`create_time`,warning.`update_time`,

zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectDcWarningVo">
         select id, stake_mark stakeMark, direction, dept_id deptId,
-               warning_state warningState,vehicle_type,
+               warning_state warningState,vehicle_type  vehicleType,
                DATE_FORMAT(warning_time,'%Y-%m-%d %H:%m:%s')warningTime,
                user_id userId, warning_source warningSource, warning_level warningLevel,
                remark,   DATE_FORMAT(create_time,'%Y-%m-%d %H:%m:%s')createTime,
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="export" resultType="com.zc.business.domain.DcWarning">
         SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,
-               mark.longitude,mark.latitude,warning.lane,vehicle_type,
+               mark.longitude,mark.latitude,warning.lane,warning.vehicle_type,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
                warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
                warning.`remark`, warning.`create_time`,warning.`update_time`,