增加删除资源的接口，删除资源时判断该资源时候存在资源申请，如果存在资源申请不允许删除资源。资源申请者在资源拥有者未回复该申请之前可以删除该申请。

src/main/java/com/ekexiu/portal/dao/OperationDao.java

@@ -15,6 +15,7 @@ import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
@@ -675,13 +676,49 @@ public abstract class OperationDao {
//		}
//	}
	
	@SelectList
	public abstract List<Operation> queryResourceId(Connection con, String resourceId) throws SQLException;
	
	@DeleteWith
	@From(Operation.class)
	public abstract int delete(Connection con, String operationId) throws SQLException;
	
	@DeleteWith
	@From(Operation.class)
	public abstract int deleteProRes(Connection con, String demandId, String resourceId) throws SQLException;
	/**
	 * 获取当前资源申请的状态值。
	 * @param con
	 * @param operationId 资源申请ID
	 * @return 返回资源申请状态值
	 * @throws SQLException
	 */
	public int queryOper(Connection con, String operationId) throws SQLException{
		String sql = "SELECT OPERATION_STATUS FROM OPERATION WHERE OPERATION_ID = ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			ps.setString(1, operationId);
			ResultSet rs = ps.executeQuery();
			try{
				rs.next();
				return rs.getInt(1);
			}finally{
                try{rs.close();}catch(Exception _m_2){}
            }
		}finally{
            try{ps.close();}catch(Exception _m_3){}
        }
	}
	
	public int deleteDem(Connection con,String operationId,String demandId) throws SQLException{
        int _m_1 = 1;
        String sql = "DELETE FROM OPERATION WHERE OPERATION_STATUS = 1 AND DEMAND_ID = ? AND OPERATION_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,demandId);
            ps.setString(_m_1++,operationId);
            return ps.executeUpdate();
        }finally{
            try{ps.close();}catch(Exception _m_2){}
        }
    }
	
	/**
	 * 分页查询资源申请 多条件模糊查询

src/main/java/com/ekexiu/portal/dao/PayHistoryDao.java

@@ -89,7 +89,7 @@ public abstract class PayHistoryDao {
                    _obj.setRemark(_m_2);
                    _obj.setIsonline(rs.getInt(6));
                    _obj.setPayType(rs.getInt(7));
                    _obj.setPayStatus(rs.getShort(8));
                    _obj.setPayStatus(rs.getInt(8));
                    _obj.setCreateTime(rs.getString(9));
                    operation.setDealPrice(rs.getBigDecimal(10));
                    operation.setCreateTime(rs.getString(11));

src/main/java/com/ekexiu/portal/service/OperationService.java

@@ -133,16 +133,21 @@ public class OperationService {
		this.operationDao.updatePayMethod(con, operationId, payMethod);
	}
	
	@Delete
	@Path("/{operationId}")
	public void delete(@JdbcConn(true) Connection con, String operationId) throws SQLException{
		this.operationDao.delete(con, operationId);
	}
//	@Delete
//	@Path("/{operationId}")
//	public void delete(@JdbcConn(true) Connection con, String operationId) throws SQLException{
//		this.operationDao.delete(con, operationId);
//	}
	
	@Delete
	@Path("/deleteprores")
	public void deleteProRes(@JdbcConn(true) Connection con, String demandId, String resourceId) throws SQLException {
		this.operationDao.deleteProRes(con, demandId, resourceId);
	@Path("/deleteDem")
	public boolean deleteDem(@JdbcConn(true) Connection con, String operationId, String demandId) throws SQLException {
		if(1 == this.operationDao.queryOper(con, operationId)){
			this.operationDao.deleteDem(con, operationId, demandId);
			return true;
		}else{
			return false;
		}
	}
	
	@Get

src/main/java/com/ekexiu/portal/service/ResourceService.java

@@ -18,7 +18,9 @@ import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OperationDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.po.Operation;
import com.ekexiu.portal.po.Resource;
@Path("/resource")
@@ -29,6 +31,16 @@ public class ResourceService {
	private ResourceDao resourceDao;
	@Autowrie
	private ImagesService imagesService;
	@Autowrie
	private OperationDao operationDao;
	public OperationDao getOperationDao() {
		return operationDao;
	}
	public void setOperationDao(OperationDao operationDao) {
		this.operationDao = operationDao;
	}
	public ImageDao getImageDao() {
		return imageDao;
@@ -134,9 +146,15 @@ public class ResourceService {
	
	@Delete
	@Path("/{resourceId}")
	public void delete(@JdbcConn(true) Connection con, @PathVar String resourceId) throws SQLException {
		this.imageDao.deleteRes(con, resourceId);
		this.resourceDao.delete(con, resourceId);
	public boolean delete(@JdbcConn(true) Connection con, @PathVar String resourceId) throws SQLException {
		List<Operation> operations = this.operationDao.queryResourceId(con, resourceId);
		if(operations.isEmpty()){
			this.imageDao.deleteRes(con, resourceId);
			this.resourceDao.delete(con, resourceId);
			return true;
		}else{
			return false;
		}
	}
	
	@Get