【CHG】增加基础数据表关联关系转dept_station_id判断条件

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -14,10 +14,10 @@ import java.util.Date;
 import org.springframework.stereotype.Service;
 
 /**
- * 检查表-避雷器
+ * 检查表抽象服务类
  *
- * @author wuhonghao
- * @date 2021/10/17
+ * @author ZhaoMn
+ * @date 2021/12/10
  */
 @Service
 public abstract class BusJcabServiceImpl {
@@ -34,11 +34,6 @@ public abstract class BusJcabServiceImpl {
     query.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
   }
 
-  protected void setQuery(JcebQueryVo query) {
-    // 设置查询权限
-    JcebQueryUtil.setBusJcebQuery(query);
-  }
-
   /**
    * 列表
    */
@@ -72,8 +67,10 @@ public abstract class BusJcabServiceImpl {
    * 更新
    */
   protected void setUpdate(BusJcab jcab) {
-    // 设置关联ID
-    setDeptStationId(jcab);
+    if(StringUtils.isNotEmpty(jcab.getStationId())){
+      // 设置关联ID
+      setDeptStationId(jcab);
+    }
     jcab.setUpdateTime(new Date());
     jcab.setUpdateBy(SecurityUtils.getUsername());
   }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -19,120 +19,124 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
-* @author zhaomn
-*/
+ * 检测表抽象服务类
+ *
+ * @author zhaomn
+ */
 @Service
 public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebService<T> {
 
-	private final BusJcebMapper<T> busJcebMapper;
-	private final IBaseStationService stationService;
+  private final BusJcebMapper<T> busJcebMapper;
+  private final IBaseStationService stationService;
 
-	public BusJcebServiceImpl(BusJcebMapper<T> busJcebMapper, IBaseStationService stationService) {
-		this.busJcebMapper = busJcebMapper;
-		this.stationService = stationService;
-	}
+  public BusJcebServiceImpl(BusJcebMapper<T> busJcebMapper, IBaseStationService stationService) {
+    this.busJcebMapper = busJcebMapper;
+    this.stationService = stationService;
+  }
 
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcebMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	 * 查询列表
-	 */
-	@Override
-	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
-		// 设置查询权限
-		JcebQueryUtil.setBusJcebQuery(query);
-		return busJcebMapper.getListByType(query);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    // 设置查询权限
+    JcebQueryUtil.setBusJcebQuery(query);
+    return busJcebMapper.getListByType(query);
+  }
 
-	/**
-	 * 查询列表
-	 */
-	@Override
-	public JcebRecordVo getCountByType(JcebQueryVo query) {
-		// 设置查询权限
-		JcebQueryUtil.setBusJcebQuery(query);
-		return busJcebMapper.getCountByType(query);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    // 设置查询权限
+    JcebQueryUtil.setBusJcebQuery(query);
+    return busJcebMapper.getCountByType(query);
+  }
 
-	/**
-	 * 列表
-	 */
-	protected void setList(BusJceb jceb) {
-		// 设置查询权限
-		JcebQueryUtil.setBusJceb(jceb);
-		if(StringUtils.isNotEmpty(jceb.getOrderBy())){
-			jceb.setOrderBy(SqlUtil.humpToLine(jceb.getOrderBy()));
-		} else {
-			// 默认倒序排列
-			jceb.setOrderBy("operation_date");
-			jceb.setIsAsc("0");
-		}
-	}
+  /**
+   * 列表
+   */
+  protected void setList(BusJceb jceb) {
+    // 设置查询权限
+    JcebQueryUtil.setBusJceb(jceb);
+    if (StringUtils.isNotEmpty(jceb.getOrderBy())) {
+      jceb.setOrderBy(SqlUtil.humpToLine(jceb.getOrderBy()));
+    } else {
+      // 默认倒序排列
+      jceb.setOrderBy("operation_date");
+      jceb.setIsAsc("0");
+    }
+  }
 
-	/**
-	 * 创建
-	 */
-	protected void setCreate(BusJceb jceb) {
-		// 设置关联ID
-		setDeptStationId(jceb);
-		if (StringUtils.isBlank(jceb.getSubmitState())) {
-			jceb.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
-		}
-		jceb.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
-		jceb.setCreateTime(new Date());
-		jceb.setCreateBy(SecurityUtils.getUsername());
-	}
+  /**
+   * 创建
+   */
+  protected void setCreate(BusJceb jceb) {
+    // 设置关联ID
+    setDeptStationId(jceb);
+    if (StringUtils.isBlank(jceb.getSubmitState())) {
+      jceb.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
+    }
+    jceb.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
+    jceb.setCreateTime(new Date());
+    jceb.setCreateBy(SecurityUtils.getUsername());
+  }
 
-	/**
-	 * 更新
-	 */
-	protected void setUpdate(BusJceb jceb) {
-		// 设置关联ID
-		setDeptStationId(jceb);
-		jceb.setUpdateTime(new Date());
-		jceb.setUpdateBy(SecurityUtils.getUsername());
-	}
+  /**
+   * 更新
+   */
+  protected void setUpdate(BusJceb jceb) {
+    if (StringUtils.isNotEmpty(jceb.getStationId())) {
+      // 设置关联ID
+      setDeptStationId(jceb);
+    }
+    jceb.setUpdateTime(new Date());
+    jceb.setUpdateBy(SecurityUtils.getUsername());
+  }
 
-	/**
-	 * 设置区间ID
-	 */
-	protected void setDeptStationId(BusJceb jceb) {
-		BaseDeptStation deptStation = stationService.getInfo(jceb.getDeptId(),
-				jceb.getLineId(), jceb.getStationId());
-		jceb.setDeptStationId(deptStation.getId());
-	}
+  /**
+   * 设置区间ID
+   */
+  protected void setDeptStationId(BusJceb jceb) {
+    BaseDeptStation deptStation = stationService.getInfo(jceb.getDeptId(),
+        jceb.getLineId(), jceb.getStationId());
+    jceb.setDeptStationId(deptStation.getId());
+  }
 
-	/**
-	 * 提交
-	 */
-	protected void setSubmit(BusJceb jceb) {
-		jceb.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-	}
+  /**
+   * 提交
+   */
+  protected void setSubmit(BusJceb jceb) {
+    jceb.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+  }
 
-	/**
-	 * 退回
-	 */
-	protected void setReject(BusJceb jceb) {
-		jceb.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-	}
+  /**
+   * 退回
+   */
+  protected void setReject(BusJceb jceb) {
+    jceb.setSubmitState(JcebStatusEnum.RETURNED.getCode());
+  }
 
-	/**
-	 * 确认
-	 */
-	protected void setConfirm(BusJceb jceb) {
-		jceb.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-	}
+  /**
+   * 确认
+   */
+  protected void setConfirm(BusJceb jceb) {
+    jceb.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
+  }
 
 }

railway-common/src/main/java/com/railway/common/utils/StringUtils.java

@@ -135,6 +135,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     return isNull(str);
   }
 
+  /**
+   * * 判断一个字符串是否为空串
+   *
+   * @param str String
+   * @return true：为空 false：非空
+   */
+  public static boolean isNotEmpty(Long str) {
+    return !isNull(str);
+  }
+
   /**
    * * 判断一个字符串是否为非空串
    *