值班信息完善

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/AlFsdAllControllerWeb.java

@@ -28,7 +28,7 @@ public class AlFsdAllControllerWeb {
      * @return
      */
     @GetMapping("/alFsdAllNumber")
-    private ApiResult<AlFsdAllVO> alFsdAllNumber(@RequestParam(required = false) Date startTime,
+    public ApiResult<AlFsdAllVO> alFsdAllNumber(@RequestParam(required = false) Date startTime,
                                                  @RequestParam(required = false) Date endTime){
         return ApiResult.success(alFsdAllService.getAlFsdAllNumber(startTime,endTime));
     }

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/ReportComplaintControllerWeb.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 举报投诉
@@ -50,8 +51,8 @@ public class ReportComplaintControllerWeb {
      * @return
      */
     @GetMapping("/reportComplaint")
-    public ApiResult<ReportComplaintVO> getReportComplaint(@RequestParam(required = false) Date startTime,
-                                                           @RequestParam(required = false) Date endTime){
+    public ApiResult<List<ReportComplaintVO>> getReportComplaint(@RequestParam(required = false) Date startTime,
+                                                                @RequestParam(required = false) Date endTime){
         return ApiResult.success(reportComplaintService.getReportComplaint(startTime, endTime));
     }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/UnitBeOnDutyControllerWeb.java

@@ -6,8 +6,12 @@ import com.bizmatics.mhfire.service.UnitBeOnDutyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 支队值班
  * @author yq
@@ -26,8 +30,15 @@ public class UnitBeOnDutyControllerWeb {
      * @return
      */
     @GetMapping("/one")
-    public ApiResult<UnitBeOnDutyPO> getOne(){
-        return ApiResult.success(unitBeOnDutyService.gerOneByToday());
+    public ApiResult<List<UnitBeOnDutyPO>> getOneByToday(){
+        return ApiResult.success(unitBeOnDutyService.getOneByToday());
+    }
+
+
+    @GetMapping("/list")
+    public ApiResult<List<List<UnitBeOnDutyPO>>> list(@RequestParam(required = false) Date startTime,
+                                                @RequestParam(required = false) Date endTime){
+        return ApiResult.success(unitBeOnDutyService.list(startTime,endTime));
     }
 
 }

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/UnitBeOnDutyMapper.java

@@ -3,6 +3,8 @@ package com.bizmatics.mhfire.persistence.mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,7 +16,11 @@ import java.util.Map;
 public interface UnitBeOnDutyMapper {
 
 
-    Map<String,Object> getOne(@Param("id") String id);
+
+
+    List<Map<String,String>> list(@Param("startTime") Date startTime,
+                                  @Param("endTime") Date endTime);
+
 
 
 }

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/UnitBeOnDutyPO.java

@@ -2,6 +2,8 @@ package com.bizmatics.mhfire.persistence.mapper.po;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/5/27 15:19
@@ -11,34 +13,34 @@ import lombok.Data;
 public class UnitBeOnDutyPO {
 
     /**
-     * 值班领导
+     * 名称
      */
-    private String lead;
+    private String name;
 
-    /**
-     * 作战指挥长
-     */
-    private String chiefOfOperations;
 
     /**
-     * 作战助理
+     * 岗位名称
      */
-    private String combatAssistant;
+    private String postName;
+
 
     /**
-     * 调度助理
+     * 机构名称
      */
-    private String schedulingAssistant;
-
+    private String organizationName;
 
     /**
-     * 防火宣传助理
+     * 机构简称
      */
-    private String fireSelectAssistant;
+    private String organizationShort;
+    /**
+     * 机构地址
+      */
+    private String organizationAddress;
 
     /**
-     * 行政值班
+     * 值班日期
      */
-    private String administrativeDuty;
+    private String time;
 
 }

mhfire-mapping/src/main/resources/mapper/mysql/UnitBeOnDutyMapper.xml

@@ -2,7 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.UnitBeOnDutyMapper">
 
-    <select id="getOne" resultType="java.util.Map">
-        select * from jbzb-zbb;
+    <select id="list" resultType="java.util.Map">
+        select * from `jbzb-zbb`
+        <where>
+            <if test="startTime != null">
+                and `值班日期` >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                and `值班日期` &lt;= #{endTime}
+            </if>
+        </where>
     </select>
 </mapper>

mhfire-service/src/main/java/com/bizmatics/mhfire/service/UnitBeOnDutyService.java

@@ -2,6 +2,9 @@ package com.bizmatics.mhfire.service;
 
 import com.bizmatics.mhfire.persistence.mapper.po.UnitBeOnDutyPO;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author yq
  * @date 2021/5/27 15:17
@@ -11,16 +14,17 @@ public interface UnitBeOnDutyService {
 
 
     /**
-     * getOne
+     * 获取今日值班表
      * @return
      */
-    UnitBeOnDutyPO getOne(String id);
-
+    List<UnitBeOnDutyPO> getOneByToday();
 
     /**
-     * 获取今日值班表
+     * list
+     * @param startTime
+     * @param endTime
      * @return
      */
-    UnitBeOnDutyPO gerOneByToday();
+    List<List<UnitBeOnDutyPO>> list(Date startTime,Date endTime);
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitBeOnDutyServiceImpl.java

@@ -1,12 +1,14 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.mhfire.persistence.mapper.UnitBeOnDutyMapper;
 import com.bizmatics.mhfire.service.UnitBeOnDutyService;
 import com.bizmatics.mhfire.persistence.mapper.po.UnitBeOnDutyPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author yq
@@ -17,23 +19,41 @@ public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
 
     @Autowired
     private UnitBeOnDutyMapper unitBeOnDutyMapper;
+
     @Override
-    public UnitBeOnDutyPO getOne(String id) {
-        return enhanceUnitBeOnDutyPo(unitBeOnDutyMapper.getOne(id));
+    public List<UnitBeOnDutyPO> getOneByToday() {
+        List<UnitBeOnDutyPO> list = new ArrayList<>();
+        Date date = new Date();
+        Date dayStartTime = DateUtils.getDayStartTime(date);
+        Date dayEndTime = DateUtils.getDayEndTime(date);
+        List<Map<String, String>> unitBeOnDutyLists = unitBeOnDutyMapper.list(dayStartTime, dayEndTime);
+        unitBeOnDutyLists.forEach(stringStringMap -> list.add(enhanceUnitBeOnDutyPo(stringStringMap)));
+        return list;
     }
 
     @Override
-    public UnitBeOnDutyPO gerOneByToday() {
-        //TODO 获取今日的值班情况
-        UnitBeOnDutyPO unitBeOnDutyPO = new UnitBeOnDutyPO();
-        return unitBeOnDutyPO;
+    public List<List<UnitBeOnDutyPO>> list(Date startTime, Date endTime) {
+        List<List<UnitBeOnDutyPO>> lists = new ArrayList<>();
+        List<UnitBeOnDutyPO> list = new ArrayList<>();
+        List<Map<String, String>> unitBeOnDutyLists = unitBeOnDutyMapper.list(startTime, endTime);
+        unitBeOnDutyLists.forEach(stringStringMap -> list.add(enhanceUnitBeOnDutyPo(stringStringMap)));
+        TreeMap<String, List<UnitBeOnDutyPO>> collect = list.stream().collect(Collectors.groupingBy(UnitBeOnDutyPO::getTime, TreeMap::new, Collectors.toList()));
+        for (String s:collect.keySet()) {
+            lists.add(collect.get(s));
+        }
+        return lists;
     }
 
 
-    public UnitBeOnDutyPO enhanceUnitBeOnDutyPo(Map<String,Object> unitBeOnDutyMap){
+
+    public UnitBeOnDutyPO enhanceUnitBeOnDutyPo(Map<String,String> unitBeOnDutyMap){
         UnitBeOnDutyPO unitBeOnDutyPo = new UnitBeOnDutyPO();
-        unitBeOnDutyPo.setLead(unitBeOnDutyMap.get("值班人员姓名").toString());
-        //TODO 值班信息全部没有
+        unitBeOnDutyPo.setName(unitBeOnDutyMap.get("值班人员姓名"));
+        unitBeOnDutyPo.setPostName(unitBeOnDutyMap.get("值班岗位名称"));
+        unitBeOnDutyPo.setOrganizationName(unitBeOnDutyMap.get("机构名称"));
+        unitBeOnDutyPo.setOrganizationShort(unitBeOnDutyMap.get("机构简称"));
+        unitBeOnDutyPo.setOrganizationAddress(unitBeOnDutyMap.get("机构地址"));
+        unitBeOnDutyPo.setTime(unitBeOnDutyMap.get("值班日期"));
         return unitBeOnDutyPo;
     }
 }