mybatis plus分页修改，

日期字段问题修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -4,10 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zd.algorithm.api.fire.RemoteFireDeviceService;
 import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
-import com.zd.algorithm.api.rfid.domain.entity.HardwareRfid;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
@@ -155,8 +153,9 @@ public class LabRiskPlanController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.LIST)
     @PostMapping("/lists")
     public TableDataInfo lists(@RequestBody RiskPlanVo riskPlanVo) {
-        Page<HardwareRfid> pages = labRiskPlanService.queryRiskPlanList(new Page(riskPlanVo.getPageNum(), riskPlanVo.getPageSize()), riskPlanVo);
-        return getDataTable(pages.getRecords(),pages.getTotal());
+        startPage();
+        List<LabRiskPlanDTO> list = labRiskPlanService.queryRiskPlanList(riskPlanVo);
+        return getDataTable(list);
     }
 
     /**
@@ -173,8 +172,9 @@ public class LabRiskPlanController extends BaseController {
      */
     @PostMapping(value = "/getLabRiskPlanJoinSub")
     public TableDataInfo getLabRiskPlanJoinSub(@RequestBody LabRiskPlanSubVo labRiskPlanSubVo) {
-        Page<LabSubjectVO> labRiskPlanJoinSubInfo = labRiskPlanService.getLabRiskPlanJoinSubInfo(labRiskPlanSubVo);
-        return getDataTable(labRiskPlanJoinSubInfo.getRecords(),labRiskPlanJoinSubInfo.getTotal());
+        startPage();
+        List<LabSubjectVO> labRiskPlanJoinSubInfo = labRiskPlanService.getLabRiskPlanJoinSubInfo(labRiskPlanSubVo);
+        return getDataTable(labRiskPlanJoinSubInfo);
     }
 
     /**
@@ -182,8 +182,9 @@ public class LabRiskPlanController extends BaseController {
      */
     @PostMapping(value = "/getLabRiskPlanNoJoinSub")
     public TableDataInfo getLabRiskPlanNoJoinSub(@RequestBody LabRiskPlanSubVo labRiskPlanSubVo) {
-        Page<LabSubjectVO> labRiskPlanJoinSubInfo = labRiskPlanService.getLabRiskPlanNoJoinSub(labRiskPlanSubVo);
-        return getDataTable(labRiskPlanJoinSubInfo.getRecords(),labRiskPlanJoinSubInfo.getTotal());
+        startPage();
+        List<LabSubjectVO> labRiskPlanJoinSubInfo = labRiskPlanService.getLabRiskPlanNoJoinSub(labRiskPlanSubVo);
+        return getDataTable(labRiskPlanJoinSubInfo);
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanSubVo.java

@@ -31,9 +31,9 @@ public class LabRiskPlanSubVo {
     @ApiModelProperty(name = "安全分级")
     private Integer level;
     @ApiModelProperty(value = "开始时间")
-    private String startTime;
+    private String startDate;
     @ApiModelProperty(value = "结束时间")
-    private String endTime;
+    private String endDate;
 
     @ApiModelProperty(name = "实验室ids")
     private String subjectIds;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabRiskPlanMapper.java

@@ -1,7 +1,6 @@
 package com.zd.laboratory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zd.laboratory.domain.LabRiskPlan;
 import com.zd.laboratory.domain.dto.LabRiskPlanDTO;
 import com.zd.laboratory.domain.vo.LabRiskPlanSubVo;
@@ -80,13 +79,11 @@ public interface LabRiskPlanMapper extends BaseMapper<LabRiskPlan> {
 
     int selectLabRiskPlanByName(String name);
 
-    Page<LabRiskPlan> queryRiskPlanList(Page<LabRiskPlan> page, @Param("riskPlanVo") RiskPlanVo riskPlanVo);
+    List<LabRiskPlanDTO> queryRiskPlanList(@Param("riskPlanVo") RiskPlanVo riskPlanVo);
 
     List<Integer> selectSensorType(Long riskPlanId);
 
-    Page<LabSubjectVO> selectRelationSubList(Page<LabSubjectVO> page,@Param("labRiskPlanSubVo") LabRiskPlanSubVo labRiskPlanSubVo);
-
-    Page<LabSubjectVO> getLabRiskPlanNoJoinSub(Page<LabSubjectVO> page,@Param("labRiskPlanSubVo") LabRiskPlanSubVo labRiskPlanSubVo);
+    List<LabSubjectVO> selectRelationSubList(@Param("labRiskPlanSubVo") LabRiskPlanSubVo labRiskPlanSubVo);
 
     List<LabSubjectVO> getLabRiskPlanNoJoinSub(@Param("labRiskPlanSubVo") LabRiskPlanSubVo labRiskPlanSubVo);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabRiskPlanService.java

@@ -1,6 +1,5 @@
 package com.zd.laboratory.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SubFunction;
@@ -145,13 +144,13 @@ public interface ILabRiskPlanService  extends IService<LabRiskPlan> {
      * @param labRiskPlan
      * @return
      */
-    Page<LabRiskPlan> queryRiskPlanList(Page<LabRiskPlan> page,RiskPlanVo riskPlanVo);
+    List<LabRiskPlanDTO> queryRiskPlanList(RiskPlanVo riskPlanVo);
 
-    Page<LabSubjectVO> getLabRiskPlanJoinSubInfo(LabRiskPlanSubVo labRiskPlanSubVo);
+    List<LabSubjectVO> getLabRiskPlanJoinSubInfo(LabRiskPlanSubVo labRiskPlanSubVo);
 
     int checkBinding(String ids);
 
-    Page<LabSubjectVO> getLabRiskPlanNoJoinSub(LabRiskPlanSubVo labRiskPlanSubVo);
+    List<LabSubjectVO> getLabRiskPlanNoJoinSub(LabRiskPlanSubVo labRiskPlanSubVo);
 
     ResultData riskPlanJoinSub(LabRiskPlanSubVoInfo labRiskPlanSubVoInfo);
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -77,7 +77,7 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
                 for(int x=0;x<sensorList.size();x++){
                     JSONObject jsonObj=sensorList.getJSONObject(x);
                     String unit = jsonObj.get("unit")+"";
-                    if(StringUtils.isNotNull(unit)){
+                    if(StringUtils.isNotBlank(unit)){
                         sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+""+jsonObj.get("unit")+"  ");
                     }else{
                         sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+"  ");

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.json.JSONObject;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.algorithm.api.camera.feign.RemoteCameraService;
 import com.zd.algorithm.api.speaker.entity.ParamVo;
@@ -1492,39 +1491,18 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
     @Override
-    public Page<LabRiskPlan> queryRiskPlanList(Page<LabRiskPlan> page, RiskPlanVo riskPlan) {
+    public List<LabRiskPlanDTO> queryRiskPlanList(RiskPlanVo riskPlan) {
         //预案列表
-        Page<LabRiskPlan> labRiskPlans = labRiskPlanMapper.queryRiskPlanList(new Page<>(riskPlan.getPageNum(), riskPlan.getPageSize()), riskPlan);
-        //根据预案查询分级信息
-//        for (LabRiskPlan labRiskPlan : labRiskPlans.getRecords()) {
-//            List<LabRiskPlanLevel> labRiskPlanLevels = labRiskPlanLevelService.queryRiskPlanLevelList(labRiskPlan.getId());
-//            labRiskPlan.setLabRiskPlanLevels(labRiskPlanLevels);
-//
-//            //根据预案查询出绑定实验室
-//            List<LabSubjectVO> labSubjectVos = labRiskPlanjoinsubMapper.selectLabRiskPlanjoinsubByRiskPlanId(labRiskPlan.getId());
-//            //根据实验室id和预案id查询当前预案和实验室下绑定的传感器和危险源
-//            List<RiskPlanSubjectRelationVo> riskPlanSubjectRelationVoList = new ArrayList<>();
-//            for (LabSubjectVO labSubjectVO : labSubjectVos) {
-//                RiskPlanSubjectRelationVo riskPlanSubjectRelationVo = new RiskPlanSubjectRelationVo();
-//                List<LabSensorHazardRelation> labSensorHazardRelations = labSensorHazardRelationService.getSensorHazardList(labRiskPlan.getId(),labSubjectVO.getId());
-//                riskPlanSubjectRelationVo.setSubjectId(labSubjectVO.getId());
-//                riskPlanSubjectRelationVo.setLabSensorHazardRelations(labSensorHazardRelations);
-//                riskPlanSubjectRelationVoList.add(riskPlanSubjectRelationVo);
-//            }
-//            labRiskPlan.setRiskPlanSubjectRelationVoList(riskPlanSubjectRelationVoList);
-//        }
-        return labRiskPlans;
+        List<LabRiskPlanDTO> list = labRiskPlanMapper.queryRiskPlanList(riskPlan);
+        return list;
     }
-
     @Override
-    public Page<LabSubjectVO> getLabRiskPlanJoinSubInfo(LabRiskPlanSubVo labRiskPlanSubVo) {
+    public List<LabSubjectVO> getLabRiskPlanJoinSubInfo(LabRiskPlanSubVo labRiskPlanSubVo) {
         //通过传感器字符串和预案id查询相关实验室列表
-        Page<LabSubjectVO> labSubjectVOS = labRiskPlanMapper.selectRelationSubList(new Page<LabSubjectVO>(labRiskPlanSubVo.getPageNum(), labRiskPlanSubVo.getPageSize()), labRiskPlanSubVo);
-//        String types = getSensorTypesByRiskPlanId(labRiskPlanSubVo.getRiskPlanId());
+        List<LabSubjectVO> labSubjectVOS = labRiskPlanMapper.selectRelationSubList(labRiskPlanSubVo);
         List<Integer> collect = labRiskPlanMapper.selectSensorType(labRiskPlanSubVo.getRiskPlanId());
-//        List<Long> collect = Arrays.stream(StrUtil.splitToLong(types, ",")).boxed().collect(Collectors.toList());
         if (null != labRiskPlanSubVo.getRiskPlanId()) {
-            for (LabSubjectVO labSubjectVO : labSubjectVOS.getRecords()) {
+            for (LabSubjectVO labSubjectVO : labSubjectVOS) {
                 List<LabSensorHazardRelation> labSensorHazardRelations = labSensorHazardRelationService.getSensorHazardList(labRiskPlanSubVo.getRiskPlanId(), labSubjectVO.getId());
                 List<Integer> list = labSensorService.getSensorTypesBySubId(labSubjectVO.getId());
                 if (isListEqual(collect, list)) {
@@ -1540,13 +1518,11 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
 
     @Override
-    public Page<LabSubjectVO> getLabRiskPlanNoJoinSub(LabRiskPlanSubVo labRiskPlanSubVo) {
-//        String typeIds = getSensorTypesByRiskPlanId(labRiskPlanSubVo.getRiskPlanId());
-//        labRiskPlanSubVo.setTypes(typeIds);
+    public List<LabSubjectVO> getLabRiskPlanNoJoinSub(LabRiskPlanSubVo labRiskPlanSubVo) {
         labRiskPlanSubVo.setUserId(tokenService.getLoginUser().getUserid());
-        Page<LabSubjectVO> labSubjectVOS = labRiskPlanMapper.getLabRiskPlanNoJoinSub(new Page<LabSubjectVO>(labRiskPlanSubVo.getPageNum(), labRiskPlanSubVo.getPageSize()), labRiskPlanSubVo);
-        if (labSubjectVOS.getRecords().size() > 0) {
-            for (LabSubjectVO labSubjectVO : labSubjectVOS.getRecords()) {
+        List<LabSubjectVO> labSubjectVOS = labRiskPlanMapper.getLabRiskPlanNoJoinSub(labRiskPlanSubVo);
+        if (labSubjectVOS.size() > 0) {
+            for (LabSubjectVO labSubjectVO : labSubjectVOS) {
                 List<LabSensor> sensorListBySubId = labSensorService.getSensorListBySubId(labSubjectVO.getId());
                 List<LabHazardSubVO> labHazardSubVOS = labHazardSubjectRelationService.queryHazardSubListVO(labSubjectVO.getId());
                 labSubjectVO.setLabSensorList(sensorListBySubId);

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

@@ -497,9 +497,9 @@
             <if test="labRiskPlanSubVo.typeId != null">
                 and ls.type_id = #{labRiskPlanSubVo.typeId}
             </if>
-            <if test="labRiskPlanSubVo.startTime != null and labRiskPlanSubVo.endTime != null">
-                and lrp.create_time between #{labRiskPlanSubVo.startTime}
-                and #{labRiskPlanSubVo.endTime}
+            <if test="labRiskPlanSubVo.startDate != null and labRiskPlanSubVo.endDate != null">
+                and lrp.create_time between #{labRiskPlanSubVo.startDate}
+                and #{labRiskPlanSubVo.endDate}
             </if>
         </where>
         order by lrp.create_time desc