代码漏提

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

 package com.yeejoin.amos.fas.business.service.impl;
 
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.annotation.PostConstruct;
-
-import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
-import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
-import com.yeejoin.amos.fas.business.vo.EquipmentSpecificVo;
-import com.yeejoin.amos.fas.core.util.StringUtil;
-import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
-import com.yeejoin.amos.fas.dao.entity.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-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.multipart.MultipartFile;
-
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
+import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
@@ -51,6 +17,7 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
 import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.query.BaseQuerySpecification;
+import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
@@ -58,6 +25,22 @@ import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
 
 @Service("equipService")
 public class EquipmentServiceImpl implements IEquipmentService {
@@ -90,8 +73,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
     private RedisTemplate redisTemplate;
 
 
-    @Autowired
-    private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
+//    @Autowired
+//    private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
 
 //    @Autowired
 //    private MongoTemplate mongoTemplate;

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

@@ -39,7 +39,9 @@ import com.yeejoin.amos.fas.common.enums.RiskSourceRegionEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
+import com.yeejoin.amos.fas.core.enums.NumberEnum;
 import com.yeejoin.amos.fas.core.enums.ReserveEnum;
+import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.exception.YeeException;
@@ -178,7 +180,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     @Value("${station.name}")
     private String stationName;
-    
+
     @Autowired
     IEquipManageFeign iEquipManageFeign;