合并代码解决冲突文件

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -780,7 +780,6 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> getFEquipInfoList(@Param("bizOrgCode") String bizOrgCode);
 
-    List<Map<String, Object>> getEquipIndexList(@Param("collect") List<String> collect);
 
     List<Map<String, Object>> getFEquipInfoListCategory(@Param("bizOrgCode") String bizOrgCode);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -363,8 +363,6 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     Map<String, Object> getCenterSystemAlarmTrend(String systemCode, String updateTime, String bizOrgCode, String startDate, String endDate);
 
-    List<Map<String, Object>> getFireCannonInfo(String bizOrgCode);
-
     Map<String, Object> getSystemAlarmTrendForSbpt(String systemCode, String updateTime);
 
     List<OrgMenuDto> getSystemEquipTree(String systemCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -55,7 +55,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -66,10 +65,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
+
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -77,7 +73,6 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static java.lang.String.valueOf;
 
@@ -197,9 +192,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Lazy
     IWlCarMileageService iWlCarMileageService;
 
-    @Value("${equipment.plan.monitor}")
-    String monitorCodes;
-
     @Autowired
     private UnitMapper unitMapper;
 
@@ -2832,12 +2824,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         return resMap;
     }
 
-    @Override
-    public List<Map<String, Object>> getFireCannonInfo(String bizOrgCode) {
-        String[] strings = monitorCodes.split(",");
-        List<Map<String, Object>> list = fireFightingSystemMapper.getFireCannonInfo(bizOrgCode, strings);
-        return Optional.ofNullable(list).orElse(org.apache.commons.compress.utils.Lists.newArrayList());
-    }
 
     @Override
     public Map<String, Object> getSystemAlarmTrendForSbpt(String systemCode, String updateTime) {