Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAttendanceController.java

@@ -3,11 +3,16 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.util.StringUtils;
 import com.usky.fire.domain.PatrolInspectionAttendance;
 import com.usky.fire.service.PatrolInspectionAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 
 /**
  * <p>
@@ -29,8 +34,20 @@ public class PatrolInspectionAttendanceController {
      * @return
      */
     @GetMapping("/pageQuery")
-    public ApiResult<CommonPage<PatrolInspectionAttendance>> pageQuery(@RequestBody String requestBody) {
-        return ApiResult.success(patrolInspectionAttendanceService.pageList(requestBody));
+    public ApiResult<CommonPage<PatrolInspectionAttendance>> pageQuery(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                       @RequestParam(value = "typeId", required = false, defaultValue = "") Integer typeId,
+                                                                       @RequestParam(value = "operator",required = false, defaultValue = "") String operator,
+                                                                       @RequestParam(value = "startTime", required = false)String startTimeStr,
+                                                                       @RequestParam(value = "endTime", required = false)String endTimeStr) {
+        LocalDateTime startTime = StringUtils.isNotBlank(startTimeStr) ?
+                LocalDateTime.parse(startTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) :
+                null;
+        LocalDateTime endTime = StringUtils.isNotBlank(endTimeStr) ?
+                LocalDateTime.parse(endTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) :
+                LocalDateTime.now();
+
+        return ApiResult.success(patrolInspectionAttendanceService.pageList(pageNum,pageSize,typeId,operator,startTime,endTime));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionAttendanceService.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 public interface PatrolInspectionAttendanceService extends CrudService<PatrolInspectionAttendance> {
 
-    CommonPage<PatrolInspectionAttendance> pageList(String requestBody);
+    CommonPage<PatrolInspectionAttendance> pageList( Integer pageNum,Integer pageSize,Integer typeId,String operator,LocalDateTime startTime,LocalDateTime endTime);
 
     void add(PatrolInspectionAttendance patrolInspectionAttendance);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -1,6 +1,5 @@
 package com.usky.fire.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,7 +14,6 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 
 /**
@@ -29,18 +27,7 @@ import java.time.format.DateTimeFormatter;
 @Service
 public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<PatrolInspectionAttendanceMapper, PatrolInspectionAttendance> implements PatrolInspectionAttendanceService {
     @Override
-    public CommonPage<PatrolInspectionAttendance> pageList(String requestBody) {
-        JSONObject request = JSONObject.parseObject(requestBody);
-        Integer pageNum = (Integer) request.getOrDefault("pageNum",1);
-        Integer pageSize = (Integer) request.getOrDefault("pageSize",10);
-        Integer typeId = (Integer) request.get("typeId");
-        String operator = (String) request.get("operator");
-        String startTimeStr = request.getString("startTime");
-        LocalDateTime startTime = StringUtils.isNotBlank(startTimeStr) ? LocalDateTime.parse(startTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null;
-        String endTimeStr = request.getString("endTime");
-        LocalDateTime endTime = StringUtils.isNotBlank(endTimeStr) ? LocalDateTime.parse(endTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : LocalDateTime.now();
-        //LocalDateTime startTime = (LocalDateTime) requestVO.getOrDefault("startTime",null);
-        //LocalDateTime endTime = (LocalDateTime) requestVO.getOrDefault("endTime",LocalDateTime.now());
+    public CommonPage<PatrolInspectionAttendance> pageList(Integer pageNum, Integer pageSize, Integer typeId, String operator, LocalDateTime startTime, LocalDateTime endTime) {
         IPage<PatrolInspectionAttendance> page = new Page<>(pageNum,pageSize);
         LambdaQueryWrapper<PatrolInspectionAttendance> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectionAttendance::getTenantId,SecurityUtils.getTenantId());