修复删除对象Bug,关联没有删除问题

yun-zuoyi
钮海涛 6 years ago
parent a441633326
commit 9597cee596

@ -30,6 +30,7 @@ import java.util.List;
public class Resource extends BaseCode { public class Resource extends BaseCode {
@Column(name="BOTTLENECK") @Column(name="BOTTLENECK")
@ApiParam(value ="是否瓶颈资源") @ApiParam(value ="是否瓶颈资源")
@FieldAnnotation(defaultValue = "false")
private Boolean bottleneck; private Boolean bottleneck;
@Column(name="TYPE") @Column(name="TYPE")
@ -60,11 +61,11 @@ public class Resource extends BaseCode {
private Double maxProduceBatch; private Double maxProduceBatch;
@Column(name="TIME_TAIL_ADJUST") @Column(name="TIME_TAIL_ADJUST")
@ApiParam(value ="时间尾数整") @ApiParam(value ="时间尾数整")
private String timeTailAdjust; private String timeTailAdjust;
@Column(name="TIME_ADJUST") @Column(name="TIME_ADJUST")
@ApiParam(value ="时间整") @ApiParam(value ="时间整")
private String timeAdjust; private String timeAdjust;
@Column(name="MAX_PREV_SD_TIME") @Column(name="MAX_PREV_SD_TIME")
@ -80,7 +81,7 @@ public class Resource extends BaseCode {
private String maxPostSdTime; private String maxPostSdTime;
@Column(name="ROUND_TYPE") @Column(name="ROUND_TYPE")
@ApiParam(value ="时间与时间尾数圆整类型") @ApiParam(value ="圆整类型")
@FieldAnnotation(defaultValue = "ROUNDING") @FieldAnnotation(defaultValue = "ROUNDING")
private ApsEnumUtil.TIME_ROUND_TYPE roundType; private ApsEnumUtil.TIME_ROUND_TYPE roundType;

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_SERIAL_NUMBER")
@Api("取消计划规则")
public class SerialNumber extends BaseAPS {
@Column(name="NUMBER")
@ApiParam(value ="流水号")
private Integer number;
}

@ -359,30 +359,31 @@ public class BeanRelation {
* *
* @param bean * @param bean
*/ */
public static void delete(BaseBean bean) { // public static void delete(BaseBean bean) {
if (bean == null) { // if (bean == null) {
return; // return;
} // }
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); // BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders(); // List<Enum<?>> ownerSigns = beanInfo.getOwnerHolders();
for (Enum<?> holder : ownerSigns) { // for (Enum<?> holder : ownerSigns) {
List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder)); // Class<? extends BaseBean> relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass();
for (BaseBean relaBean : relaBeans) { // List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
//MemoryManager.delete(relaBean); // for (BaseBean relaBean : relaBeans) {
} // //MemoryManager.delete(relaBean);
} // }
// }
List<Enum<?>> normalSigns = beanInfo.getNormalSigns(); //
for (Enum<?> holder : normalSigns) { // List<Enum<?>> normalSigns = beanInfo.getNormalSigns();
Enum<?> reverseHolder = beanInfo.getReverseHolder(holder); // for (Enum<?> holder : normalSigns) {
List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder)); // Enum<?> reverseHolder = beanInfo.getReverseHolder(holder);
for (BaseBean relaBean : relaBeans) { // List<BaseBean> relaBeans = new ArrayList<>(list(bean, holder));
if (reverseHolder != null) { // for (BaseBean relaBean : relaBeans) {
remove(relaBean, reverseHolder, bean); // if (reverseHolder != null) {
} // remove(relaBean, reverseHolder, bean);
} // }
} // }
} // }
// }
/** /**
* lambdalambdafalse退 * lambdalambdafalse退

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.SerialNumber;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ISerialNumberRepository extends CrudRepository<SerialNumber, Long> {
}
Loading…
Cancel
Save