代码冲突提交

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -45,12 +46,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Autowired
     private IPlanOperationRecordDao planOperationRecordDao;
     @Autowired
-<<<<<<< HEAD
-    private  IEquipmentFireEquipmentDao equipmentFireEquipmentDao;
-=======
     private IEquipmentFireEquipmentDao equipmentFireEquipmentDao;
     @Qualifier("iEquipmentDao")
->>>>>>> dev_upgrade-1225
     @Autowired
     private IEquipmentDao equipmentDao;
 
@@ -148,7 +145,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     }
 
     @Override
-<<<<<<< HEAD
     public Page recordListByPage(int current, int pageSize,String planName) {
         Map<String,Object> params = new HashMap<>();
         params.put("planName",planName);
@@ -156,15 +152,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         params.put("pageSize",pageSize);
         List<HashMap<String,Object>>  result = planOperationRecordMapper.PlanOperationRecordListByPage(params);
         Integer  count = planOperationRecordMapper.PlanOperationRecordListByCount(params);
-=======
-    public Page recordListByPage(String planName, int pageNumber, int pageSize) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("planName", planName);
-        params.put("pageNumber", pageNumber);
-        params.put("pageSize", pageSize);
-        List<HashMap<String, Object>> result = planOperationRecordMapper.PlanOperationRecordListByPage(params);
-        Integer count = planOperationRecordMapper.PlanOperationRecordListByCount(params);
->>>>>>> dev_upgrade-1225
         Page page = new Page();
         page.setRecords(result);
         page.setTotal(count);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -2,13 +2,9 @@ package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.vo.ContingencyPlanParamVo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
 import com.yeejoin.amos.fas.dao.entity.PlanDetail;
 import com.yeejoin.amos.fas.exception.YeeException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
@@ -30,7 +26,7 @@ public interface IContingencyPlanService {
 
     ContingencyPlanParamVo equipmentScene(Long equipmentId);
 
-    Page recordListByPage (String planName, int pageNumber, int pageSize);
+    Page recordListByPage ( int current, int pageSize,String planName);
     /**
      * 创建
      * @param planDetail