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

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

@@ -25,6 +25,9 @@ public class DataJinganAnalysisController {
     /**
      * 电子督察单管理-电子督察单列表查询
      *
+     * @param startTime  开始时间
+     * @param endTime  结束时间
+     * @param superviseCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
@@ -32,11 +35,14 @@ public class DataJinganAnalysisController {
      * @return
      */
     @GetMapping("analysisList")
-    public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "id", required = false) Integer id,
+    public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "startTime", required = false) String startTime,
+                                                                  @RequestParam(value = "endTime", required = false) String endTime,
+                                                                  @RequestParam(value = "endTime", required = false) String superviseCode,
+                                                                  @RequestParam(value = "id", required = false) Integer id,
                                                                   @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
                                                                   @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                   @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataJinganAnalysisService.analysisList(id,handleStatus,pageNum, pageSize));
+        return ApiResult.success(dataJinganAnalysisService.analysisList(startTime,endTime,superviseCode,id, handleStatus,pageNum, pageSize));
     }
 
     /**

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

@@ -29,6 +29,9 @@ public class DataJinganPersonController {
     /**
      * 人工督察单管理-人工督察单列表查询
      *
+     * @param startTime  开始时间
+     * @param endTime  结束时间
+     * @param artificialCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
@@ -36,11 +39,15 @@ public class DataJinganPersonController {
      * @return
      */
     @GetMapping("personList")
-    public ApiResult<CommonPage<DataJinganPerson>> personList(@RequestParam(value = "id", required = false) Integer id,
+    public ApiResult<CommonPage<DataJinganPerson>> personList(@RequestParam(value = "startTime", required = false) String startTime,
+                                                              @RequestParam(value = "endTime", required = false) String endTime,
+                                                              @RequestParam(value = "endTime", required = false) String artificialCode,
+                                                              @RequestParam(value = "id", required = false) Integer id,
                                                               @RequestParam(value = "handleStatus", required = false) Integer handleStatus,
                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(dataJinganPersonService.personList(id,handleStatus,pageNum, pageSize));
+        return ApiResult.success(dataJinganPersonService.personList(startTime,endTime,artificialCode,id,handleStatus,
+                pageNum, pageSize));
     }
 
     /**

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

@@ -17,13 +17,17 @@ public interface DataJinganAnalysisService extends CrudService<DataJinganAnalysi
     /**
      * 电子督察单管理-电子督察单列表查询
      *
+     * @param startTime  开始时间
+     * @param endTime  结束时间
+     * @param superviseCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<DataJinganAnalysis> analysisList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
+    CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime,String superviseCode,Integer id,
+                                                Integer handleStatus, Integer pageNum, Integer pageSize);
 
     void update(DataJinganAnalysis dataJinganAnalysis);
 

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

@@ -17,13 +17,16 @@ public interface DataJinganPersonService extends CrudService<DataJinganPerson> {
     /**
      * 人工督察单管理-人工督察单列表查询
      *
+     * @param startTime  开始时间
+     * @param endTime  结束时间
+     * @param artificialCode  督察单编号
      * @param id  主键ID
      * @param handleStatus  处理状态
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
      */
-    CommonPage<DataJinganPerson> personList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
+    CommonPage<DataJinganPerson> personList(String startTime, String endTime,String artificialCode,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize);
 
     void update(DataJinganPerson dataJinganPerson);
 }

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

@@ -2,10 +2,12 @@ package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.AlarmFire;
 import com.usky.fire.domain.DataJinganAnalysis;
 import com.usky.fire.mapper.DataJinganAnalysisMapper;
 import com.usky.fire.service.DataJinganAnalysisService;
@@ -28,13 +30,16 @@ import java.util.List;
 public class DataJinganAnalysisServiceImpl extends AbstractCrudService<DataJinganAnalysisMapper, DataJinganAnalysis> implements DataJinganAnalysisService {
 
     @Override
-    public CommonPage<DataJinganAnalysis> analysisList(Integer id, Integer handleStatus, Integer pageNum,
-                                                       Integer pageSize) {
+    public CommonPage<DataJinganAnalysis> analysisList(String startTime, String endTime, String superviseCode,Integer id,
+                                                       Integer handleStatus, Integer pageNum, Integer pageSize) {
         IPage<DataJinganAnalysis> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganAnalysis> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DataJinganAnalysis::getTenantId, SecurityUtils.getTenantId())
                 .eq(null != handleStatus,DataJinganAnalysis::getHandleStatus, handleStatus)
                 .eq(null != id,DataJinganAnalysis::getId, id)
+                .like(StringUtils.isNotBlank(superviseCode),DataJinganAnalysis::getSuperviseCode,superviseCode)
+                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),
+                        DataJinganAnalysis::getTimestamp, startTime, endTime)
                 .orderByDesc(DataJinganAnalysis::getId);
         page = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());

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

@@ -2,6 +2,7 @@ package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
@@ -26,12 +27,15 @@ import java.time.LocalDateTime;
 @Service
 public class DataJinganPersonServiceImpl extends AbstractCrudService<DataJinganPersonMapper, DataJinganPerson> implements DataJinganPersonService {
     @Override
-    public CommonPage<DataJinganPerson> personList(Integer id, Integer handleStatus, Integer pageNum, Integer pageSize) {
+    public CommonPage<DataJinganPerson> personList(String startTime, String endTime,String artificialCode,Integer id, Integer handleStatus, Integer pageNum, Integer pageSize) {
         IPage<DataJinganPerson> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DataJinganPerson> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DataJinganPerson::getTenantId, SecurityUtils.getTenantId())
                 .eq(null != handleStatus,DataJinganPerson::getHandleStatus, handleStatus)
                 .eq(null != id,DataJinganPerson::getId, id)
+                .like(StringUtils.isNotBlank(artificialCode),DataJinganPerson::getArtificialCode,artificialCode)
+                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),
+                        DataJinganPerson::getTimestamp, startTime, endTime)
                 .orderByDesc(DataJinganPerson::getId);
         page = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());