2023-3-30 信息牌一体机代码优化。

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -141,23 +143,55 @@ public class LabBoardApi {
 
     @ApiOperation(value = "值班人员列表")
     @GetMapping(value = "/dutyUserList")
-    public ResultData dutyUsrList(@RequestParam Long labId,@RequestParam String startTime,@RequestParam String endTime) {
-        ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectDutyUserList(labId,startTime,endTime);
-        if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
-            return ResultData.fail("值班人员列表获取失败！");
+    public ResultData dutyUsrList(@RequestParam Long labId,@RequestParam String startTime) {
+        //处理当前实验，获取当前时间的这一周的开始时间和结束时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            Date newDate = sdf.parse(startTime);
+            List<Date> allDate = dateToWeek(newDate);
+            String startTimeStr = sdf.format(allDate.get(0));
+            String endTimeStr = sdf.format(allDate.get(6));
+            ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectDutyUserList(labId,startTimeStr,endTimeStr);
+            if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
+                return ResultData.fail("值班人员列表获取失败！");
+            }
+            return ResultData.success(dutyData.getData());
+        } catch (ParseException e) {
+            e.printStackTrace();
         }
-        return ResultData.success(dutyData.getData());
+        return ResultData.fail("日期格式有误，请联系管理员!!");
+//        ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectDutyUserList(labId,startTime,endTime);
+//        if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
+//            return ResultData.fail("值班人员列表获取失败！");
+//        }
+//        return ResultData.success(dutyData.getData());
     }
 
 
     @ApiOperation(value = "巡查人员列表")
     @GetMapping(value = "/inspectUserList")
-    public ResultData inspectUserList(@RequestParam Long labId,@RequestParam String startTime,@RequestParam String endTime) {
-        ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectUserXxpInspectionList(labId,startTime,endTime);
-        if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
-            return ResultData.fail("值班人员列表获取失败！");
+    public ResultData inspectUserList(@RequestParam Long labId,@RequestParam String startTime) {
+        //处理当前实验，获取当前时间的这一周的开始时间和结束时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            Date newDate = sdf.parse(startTime);
+            List<Date> allDate = dateToWeek(newDate);
+            String startTimeStr = sdf.format(allDate.get(0));
+            String endTimeStr = sdf.format(allDate.get(6));
+            ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectUserXxpInspectionList(labId,startTimeStr,endTimeStr);
+            if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
+                return ResultData.fail("巡查人员列表获取失败！");
+            }
+            return ResultData.success(dutyData.getData());
+        } catch (ParseException e) {
+            e.printStackTrace();
         }
-        return ResultData.success();
+        return ResultData.fail("日期格式有误，请联系管理员!!");
+//        ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectUserXxpInspectionList(labId,startTime,endTime);
+//        if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
+//            return ResultData.fail("值班人员列表获取失败！");
+//        }
+//        return ResultData.success();
     }
 
     @ApiOperation(value = "实验室签到人员")
@@ -223,4 +257,18 @@ public class LabBoardApi {
         }
         return ResultData.success(resultData.getData());
     }
+
+
+    public List<Date> dateToWeek(Date mdate) {
+        int b = mdate.getDay();
+        Date fdate;
+        List<Date> list = new ArrayList<Date>();
+        Long fTime = mdate.getTime() - b * 24 * 3600000;
+        for (int a = 1; a <= 7; a++) {
+            fdate = new Date();
+            fdate.setTime(fTime + (a * 24 * 3600000));
+            list.add(a-1, fdate);
+        }
+        return list;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSecurityApplyMapper.xml

@@ -573,7 +573,7 @@
 
     <!--获取实验室准入人员信息-->
     <select id="selectLabSecurityApply" resultType="java.util.Map">
-          SELECT  id id,user_name userName,valid_end_time validEndTime,
+          SELECT  id id,user_name userName,date_format(valid_end_time,'%Y-%m-%d') validEndTime,
           (SELECT avatar FROM sys_user WHERE user_id=lab.user_id) AS avatar,
           (SELECT user_name FROM sys_user WHERE user_id=lab.user_id) AS jobNumber
                 FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time &gt;= now()

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpInspectionMapper.xml

@@ -69,8 +69,8 @@
      SELECT user_id userId,
             user_name userName,
             user_img userImg,
-            DATE_FORMAT(sign_in,"%Y-%m-%d") AS signTime,
-            MAX(sign_out) AS signOut,
+            DATE_FORMAT(sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
+            date_format(MAX(sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
             COUNT(*) AS signNumber
             FROM  `xxp_inspection` WHERE subject_id=#{labId} GROUP BY signTime,user_id
     </select>