Merge branch 'refs/heads/develop_dl' into develop_dl_4.0

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -63,6 +63,11 @@ public class Equipment extends BasicEntity  {
 	@Column(name="drain_duration")
 	private String drainDuration;
 
+	/**
+	 * 分类
+	 */
+	@Column(name="category")
+	private String category;
 
 	public String getFireTruckRoute() {
 		return fireTruckRoute;

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

@@ -40,6 +40,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -693,6 +694,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
             classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
                                                  implementationTimeRight, String equipmentId, String category) {
+                                                 implementationTimeRight,
+                                         String equipmentId, String category) {
         List<Long> classifyIdList = new ArrayList<>();
         if (classifyId != null) {
             Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.HashMap;