智慧安防-安防人员今日值班情况

src/main/java/com/sky/ioc/controller/scene/MeetingRoomController.java

@@ -28,9 +28,8 @@ public class MeetingRoomController {
     MeetingRoomService meetingRoomService;
     @ApiOperation("会议室总览")
     @PostMapping("/getMeetingRoomList")
-    public ReturnMsg getMeetingRoomList(@RequestParam(value = "floorId", required=true)  Integer floorId,
-                             @RequestParam(value = "date", required=false)String date){
-        return meetingRoomService.getMeetingRoomStatus(date,floorId);
+    public ReturnMsg getMeetingRoomList(@RequestParam(value = "date", required=false)String date){
+        return meetingRoomService.getMeetingRoomStatus(date);
     }
 
 }

src/main/java/com/sky/ioc/entity/params/Security/PersonParam.java

@@ -23,8 +23,9 @@ public class PersonParam {
      */
     private Integer pageStart =0;
 
-    /**
-     * 日期范围
-     */
-    private IocTimeRange timeRange;
+    /** 开始时间 */
+    private String startTime;
+
+    /** 结束时间 */
+    private String endTime;
 }

src/main/java/com/sky/ioc/mapper/SecurityPersonMapper.java

@@ -19,12 +19,12 @@ public interface SecurityPersonMapper extends BaseMapper<SecurityPerson> {
           "<if test='personParam!=null and personParam.type!=null'>" +
           " and person.type = #{personParam.type} " +
           "</if>" +
-          "<if test='personParam!=null and personParam.name!=\"\" '>" +
+          "<if test='personParam!=null and personParam.name!=null and personParam.name!=\"\" '>" +
           " and person.name like #{personParam.name} " +
           "</if>" +
-          "<if test='personParam!=null and personParam.timeRange!= null'>" +
-          " and duty_start_time between  #{personParam.timeRange.startTime} and #{personParam.timeRange.endTime} " +
-          " and duty_end_time between  #{personParam.timeRange.startTime} and #{personParam.timeRange.endTime} " +
+          "<if test='personParam!=null and personParam.startTime!= null'>" +
+          " and duty_start_time between  #{personParam.startTime} and #{personParam.endTime} " +
+          " and duty_end_time between  #{personParam.startTime} and #{personParam.endTime} " +
           "</if>" +
           " order by person.id limit #{personParam.pageSize} offset #{personParam.pageStart} " +
           "</script>")

src/main/java/com/sky/ioc/service/meeting/MeetingRoomService.java

@@ -6,7 +6,7 @@ import com.sky.ioc.tool.ReturnMsg;
 public interface MeetingRoomService {
     ReturnMsg getMeetingRoomList();
 
-    ReturnMsg getMeetingRoomStatus(String date,Integer floorId);
+    ReturnMsg getMeetingRoomStatus(String date);
 
 
 }

src/main/java/com/sky/ioc/service/meeting/impl/MeetingRoomServiceImpl.java

@@ -99,9 +99,8 @@ public class MeetingRoomServiceImpl implements MeetingRoomService {
     }
 
     @Override
-    public ReturnMsg getMeetingRoomStatus(String date,Integer floorId) {
-        List<MeetingRoom> lists = meetingRoomMapper.getListRoomByFloorId(floorId);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+    public ReturnMsg getMeetingRoomStatus(String date) {
+        List<MeetingRoom> lists = meetingRoomMapper.getListRoomByFloorId(null);
         SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss");
         List<Map<String,String>> mapList = new ArrayList<>();
         for (MeetingRoom room:lists) {

src/main/java/com/sky/ioc/service/security/impl/SecurityPersonServiceImpl.java

@@ -22,7 +22,7 @@ public class SecurityPersonServiceImpl implements SecurityPersonService {
 
     @Override
     public ReturnMsg getPersonList(PersonParam personParam) {
-        if(personParam!=null&&!personParam.getName().isEmpty()){
+        if(personParam!=null&&personParam.getName()!=null&&!personParam.getName().isEmpty()){
             String name = "%"+personParam.getName()+"%";
             personParam.setName(name);
         }